Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly

Conflicts:
	inc/lang/hr/searchpage.txt
	inc/lang/ko/searchpage.txt

1 files changed, 26 insertions, 3 deletions

diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js
index 76b135b23..fc020cce8 100644
--- a/lib/scripts/compatibility.js
+++ b/lib/scripts/compatibility.js
@@ -77,9 +77,32 @@ var index = {
 };
 
 var ajax_quicksearch = {
-    init: DEPRECATED_WRAP(dw_qsearch.init, dw_qsearch),
-    clear_results: DEPRECATED_WRAP(dw_qsearch.clear_results, dw_qsearch),
-    onCompletion: DEPRECATED_WRAP(dw_qsearch.onCompletion, dw_qsearch)
+    init: function() {
+        DEPRECATED('Use jQuery().dw_qsearch() instead');
+        jQuery('#qsearch__in').dw_qsearch({
+            output: '#qsearch__out'
+        });
+    },
+    clear_results: function() {
+        DEPRECATED('ajax_quicksearch.clear_results is removed');
+    },
+    onCompletion: function() {
+        DEPRECATED('ajax_quicksearch.onCompletion is removed');
+    }
+};
+var dw_qsearch = {
+    init: function(input, output) {
+        DEPRECATED('Use jQuery().dw_qsearch() instead');
+        jQuery(input).dw_qsearch({
+            output: output
+        });
+    },
+    clear_results: function() {
+        DEPRECATED('dw_qsearch.clear_results is removed');
+    },
+    onCompletion: function() {
+        DEPRECATED('dw_qsearch.onCompletion is removed');
+    }
 };
 
 var linkwiz = {