diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-02-16 23:08:08 +0100 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-02-16 23:08:08 +0100 |
| commit | e57cf65d092c1a6458c3a468b017018905018eeb (patch) | |
| tree | cb06ff0cf82afed514aa95c5c33e5faef8a9ef62 /lib/scripts | |
| parent | a0e625181ad2e2369e8db0e5691f7356363776d0 (diff) | |
| parent | 9bbf02e86e5c1181bbc288ce42f1937f309a7e79 (diff) | |
| download | rpg-e57cf65d092c1a6458c3a468b017018905018eeb.tar.gz rpg-e57cf65d092c1a6458c3a468b017018905018eeb.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into authpluginconfig
Diffstat (limited to 'lib/scripts')
| -rw-r--r-- | lib/scripts/linkwiz.js | 7 | ||||
| -rw-r--r-- | lib/scripts/qsearch.js | 9 |
2 files changed, 13 insertions, 3 deletions
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) { 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; |