From 6d6be32bd1dd668f07fc525a2e679fed98679ccf Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 16 Feb 2013 15:44:29 +0100
Subject: initialize link wizard with current namespace FS#2683

---
 lib/scripts/linkwiz.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index bb04828b4..c55650d68 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -50,6 +50,9 @@ var dw_linkwiz = {
         jQuery(dw_linkwiz.result).css('position', 'relative');
 
         dw_linkwiz.$entry = jQuery('#link__wiz_entry');
+        if(JSINFO.namespace){
+            dw_linkwiz.$entry.val(JSINFO.namespace+':');
+        }
 
         // attach event handlers
         jQuery('#link__wiz .ui-dialog-titlebar-close').click(dw_linkwiz.hide);
@@ -102,7 +105,7 @@ var dw_linkwiz = {
     /**
      * Get one of the results by index
      *
-     * @param int result div to return
+     * @param   num int result div to return
      * @returns DOMObject or null
      */
     getResult: function(num){
@@ -113,7 +116,7 @@ var dw_linkwiz = {
     /**
      * Get one of the results by index
      *
-     * @param int result div to return
+     * @param   num int result div to return
      * @returns jQuery object
      */
     $getResult: function(num) {
-- 
cgit v1.2.3


From b480dd4215925c5e9aaecaa5c086346b009692b4 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 16 Feb 2013 18:10:00 +0100
Subject: Abort old quick search requests when starting new ones

This prevents old requests that need longer than the newer ones (likely,
as if you type more less results are returned) from overriding the
results list.
---
 lib/scripts/qsearch.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/scripts')

diff --git a/lib/scripts/qsearch.js b/lib/scripts/qsearch.js
index 0c3609ada..e5cc73b49 100644
--- a/lib/scripts/qsearch.js
+++ b/lib/scripts/qsearch.js
@@ -12,6 +12,7 @@ var dw_qsearch = {
     $inObj: null,
     $outObj: null,
     timer: null,
+    curRequest: null,
 
     /**
      * initialize the quick search
@@ -35,12 +36,16 @@ var dw_qsearch = {
 
         // attach eventhandler to search field
         do_qsearch = function () {
+            // abort any previous request
+            if (dw_qsearch.curRequest != null) {
+                dw_qsearch.curRequest.abort();
+            }
             var value = dw_qsearch.$inObj.val();
             if (value === '') {
                 dw_qsearch.clear_results();
                 return;
             }
-            jQuery.post(
+            dw_qsearch.curRequest = jQuery.post(
                 DOKU_BASE + 'lib/exe/ajax.php',
                 {
                     call: 'qsearch',
@@ -84,6 +89,8 @@ var dw_qsearch = {
     onCompletion: function(data) {
         var max, $links, too_big;
 
+        dw_qsearch.curRequest = null;
+
         if (data === '') {
             dw_qsearch.clear_results();
             return;
-- 
cgit v1.2.3