X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ff0ce1c6ab545ab8b7f4166caae9d59e6a67b421..010d715dad6709bf4f67e3b04e3f669fed45bb56:/apps/wolnelektury_core/static/js/widget.js

diff --git a/apps/wolnelektury_core/static/js/widget.js b/apps/wolnelektury_core/static/js/widget.js
index 54700de7d..abadfd9cf 100644
--- a/apps/wolnelektury_core/static/js/widget.js
+++ b/apps/wolnelektury_core/static/js/widget.js
@@ -10,7 +10,7 @@ var body        = document.getElementsByTagName('body')
 var stylesheet = document.createElement('link');
 var stylesheetJQUI = document.createElement('linl');
 
-var host = 'localhost:8000'; //'www.wolnelektury.pl';
+var host = 'wolnelektury.pl';
 
 /* set attributes of created elements */
 stylesheet.setAttribute('type', 'text/css');
@@ -51,10 +51,30 @@ scriptSearch.setAttribute('type', 'text/javascript');
 scriptSearch.setAttribute('src', 'http://'+host+'/static/js/search.js');
 scriptSearch.setAttribute('id', 'wl-search-script')
 
-
 body[0].appendChild(scriptJ);
-body[0].appendChild(scriptUI);
-body[0].appendChild(scriptSearch);
+scriptJ.onload = function() { body[0].appendChild(scriptUI); };
+scriptJ.onreadystatechange = function() { if (scriptJ.readyState == 'complete') { scriptJ.onload(); } };
+
+scriptUI.onload = function() { body[0].appendChild(scriptSearch); };
+scriptUI.onreadystatechange = function() { if (scriptUI.readyState == 'complete') { scriptUI.onload(); } };
+
+scriptSearch.onload = function() {
+    	var s = $('#id_qq');
+        var url = s.attr('data-source');
+        s.search({source: 
+                        function(req, cb) {
+                        $.ajax({url: url,
+                                dataType: "jsonp",
+                                data: { term: req.term },
+                                type: "GET",
+                                success: function(data) { cb(data); },
+                                error: function() { cb([]); }
+                    });
+                        },
+            dataType: "jsonp",
+            host: "http://"+host});
+}
+scriptSearch.onreadystatechange = function() { if (scriptSearch.readyState == 'complete') { scriptSearch.onload(); } };
 
 /* append elements to widget */
 widget.appendChild(stylesheet);
@@ -83,24 +103,5 @@ if(widget.getAttribute('width') == '140'){
     widget.style.width = "140px";
 }
 
-var wl_loaded_scripts = {};
-
-function wl_initialize_after_load(just_loaded) {
-    wl_loaded_scripts[just_loaded] = true;
-    if (wl_loaded_scripts.jquery 
-	&& wl_loaded_scripts.ui 
-	&& wl_loaded_scripts.search) {
-	var s = $('#id_qq');
-	s.search({source: s.attr('data-source')});
-    }
-}
-
-scriptJ.onload = function() { wl_initialize_after_load('jquery'); };
-scriptJ.onreadystatechange = function() { if (scriptJ.readyState == 'complete') { wl_initialize_after_load('jquery'); } };
-
-scriptUI.onload = function() { wl_initialize_after_load('ui'); };
-scriptUI.onreadystatechange = function() { if (scriptUI.readyState == 'complete') { wl_initialize_after_load('jquery'); } };
 
-scriptSearch.onload = function() { wl_initialize_after_load('search'); };
-scriptSearch.onreadystatechange = function() { if (scriptSearch.readyState == 'complete') { wl_initialize_after_load('jquery'); } };