diff options
| author | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
| commit | 23678e344b4ddcad14254c106ecb93af174fdaa0 (patch) | |
| tree | a5c787e4d87313a7fb6f18cb4c78bf210d92d60c /lib/scripts/linkwiz.js | |
| parent | 847cef0a6bfd2ff9dc54e1fc140f5ba0ece0017a (diff) | |
| parent | 5721a1547938df76003c6d91ea003dc1c70abd94 (diff) | |
| download | rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.gz rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/scripts/linkwiz.js')
| -rw-r--r-- | lib/scripts/linkwiz.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index 5075a0ab8..c55650d68 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -50,9 +50,12 @@ 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_close').click(dw_linkwiz.hide); + jQuery('#link__wiz .ui-dialog-titlebar-close').click(dw_linkwiz.hide); dw_linkwiz.$entry.keyup(dw_linkwiz.onEntry); jQuery(dw_linkwiz.result).delegate('a', 'click', dw_linkwiz.onResultClick); }, @@ -64,7 +67,7 @@ var dw_linkwiz = { if(e.keyCode == 37 || e.keyCode == 39){ //left/right return true; //ignore } - if(e.keyCode == 27){ + if(e.keyCode == 27){ //Escape dw_linkwiz.hide(); e.preventDefault(); e.stopPropagation(); @@ -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) { |