Merge branch 'master' of github.com:Sankore/Sankore-3.1

resources/library/interactive/Anyembed.wgt/index.html

@@ -6,13 +6,8 @@
     <title>ubwidget</title>
     
 	<script src="js/jquery-1.3.2.min.js" type="text/javascript"></script>
-    <script src="js/jquery-ui-1.7.2.custom.min.js" type="text/javascript"></script>
 	<script src="js/jquery.disable.text.select.js" type="text/javascript"></script>
-    <script src="js/jquery.ubwidget.js" type="text/javascript"></script>
-    <script src="js/jquery.center.js" type="text/javascript"></script>
-	<script src="js/DD_roundies_0.0.2a.js" type="text/javascript"></script>
 	<script src="js/ubw-main.js" type="text/javascript"></script>
-	<script src="js/calculate.js" type="text/javascript"></script>
 
     <link rel="stylesheet" type="text/css" href="css/ubwidget.css" />
 
@@ -27,7 +22,6 @@
     </script>
 	<audio id='audio'></audio>
     <div id="ubwidget"></div>
-    
 </body>
 
 </html>
\ No newline at end of file

resources/library/interactive/Anyembed.wgt/js/ubw-main.js

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 function init(){
 	var embed;
@@ -50,15 +64,18 @@ function init(){
 	submit.click(function(){
 		$("#ubwidget").append(loadWindow)
 		embed = inputBox.val();
-		////////////!!!1/////////   
 		searchWrap.hide();
-		loadWindow.append(embed);
-		//alert($("#ubwidget").html());
-		$("#ubwidget embed").attr("wmode", "transparent");
-		var ubwidget_html = $("#ubwidget").html();
-		alert(ubwidget_html);
-		setTimeOut(alert);
-		$("#ubwidget").empty().html(ubwidget_html);
+		
+		if(/<object/.test(embed)){
+			loadWindow.append(embed);
+			loadWindow.find("embed").attr("wmode","transparent");
+			var loadWindow_content = loadWindow.html();
+			loadWindow.empty().html(loadWindow_content);
+		}
+		else {
+			loadWindow.append(embed);				
+		}
+
 		if(window.sankore){
 			window.sankore.resize($(document).width(),$(document).height());
 			window.sankore.setPreference("embed", escape(embed));

resources/library/interactive/Calculator.wgt/js/calculate.js

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 function addChar(input, character) {
 	if(input.value == null || input.value == "0")
 		input.value = character

resources/library/interactive/Calculator.wgt/js/ubw-main.js

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 function init(){
 	var h = 292;
 	var w = 160;