Merge branch 'obrazy' into rwd
[wolnelektury.git] / apps / wolnelektury_core / static / js / search.js
index 0b8dd39..4d001e0 100644 (file)
@@ -8,26 +8,15 @@ var __bind = function (self, fn) {
        options: {
           minLength: 0,
          dataType: "json",
+          host: '',
         },
 
        _create: function() {
-            console.log("dataType: " + this.options.dataType);
-            var url = this.element.data('source');
            var opts = { 
                minLength: this.options.minLength,
                select: __bind(this, this.enter),
                focus: function() { return false; },
-               source: function(req, cb) {
-                    $.ajax({url: url,
-                            dataType: "jsonp",
-                            type: "GET",
-                            success: function(data) {
-                                cb(data);
-                            },
-                            error: function() { cb([]); }
-
-                });
-                },
+                source: this.element.data('source'),
            };
 
            this.element.autocomplete($.extend(opts, this.options))
@@ -36,7 +25,7 @@ var __bind = function (self, fn) {
 
        enter: function(event, ui) {
            if (ui.item.url != undefined) {
-               location.href = ui.item.url;
+               location.href = this.options.host+ui.item.url;
            } else {
                this.element.closest('form').submit();
            }
@@ -44,7 +33,7 @@ var __bind = function (self, fn) {
    
        render_item: function (ul, item) {
            return $("<li></li>").data('item.autocomplete', item)
-               .append('<a href="'+item.url+'"><span class="search-hint-label">'+item.label+'</span>'+
+               .append('<a href="'+this.options.host+item.url+'"><span class="search-hint-label">'+item.label+'</span>'+
                        '<span class="search-hint-category mono">'+item.category+'</span></a>')
                .appendTo(ul);
        },