From 2e9c51889d8855cf56cb3f21a9c4926bd94ef21f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 16:52:41 +0100 Subject: IE8: fix namespace selection in link wizard FS#2391 IE8 can't substr() with negative offsets. --- lib/scripts/linkwiz.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts/linkwiz.js') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index cc4c19e0d..ce072d4b2 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -186,7 +186,7 @@ var dw_linkwiz = { */ resultClick: function(a){ dw_linkwiz.$entry.val(a.title); - if(a.title == '' || a.title.substr(-1) == ':'){ + if(a.title == '' || a.title.substr(a.title.length-1) == ':'){ dw_linkwiz.autocomplete_exec(); }else{ if (jQuery(a.nextSibling).is('span')) { -- cgit v1.2.3 From c798b23bcedefa974e4af474904e4e24cdad67d5 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 27 Nov 2011 17:33:52 +0100 Subject: rely on jQuery UI's dialog methods for toggling the linkwizard FS#2394 --- lib/scripts/linkwiz.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/scripts/linkwiz.js') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index ce072d4b2..dcfafd75e 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -35,13 +35,12 @@ var dw_linkwiz = { ) .parent() .attr('id','link__wiz') - .addClass('a11y') .css({ 'position': 'absolute', 'top': (pos.top+20)+'px', 'left': (pos.left+80)+'px' }) - .show() + .hide() .appendTo('div.dokuwiki'); dw_linkwiz.textArea = $editor[0]; @@ -283,7 +282,7 @@ var dw_linkwiz = { */ show: function(){ dw_linkwiz.selection = getSelection(dw_linkwiz.textArea); - dw_linkwiz.$wiz.removeClass('a11y'); + dw_linkwiz.$wiz.show(); dw_linkwiz.$entry.focus(); dw_linkwiz.autocomplete(); }, @@ -292,7 +291,7 @@ var dw_linkwiz = { * Hide the link wizard */ hide: function(){ - dw_linkwiz.$wiz.addClass('a11y'); + dw_linkwiz.$wiz.hide(); dw_linkwiz.textArea.focus(); }, @@ -300,7 +299,7 @@ var dw_linkwiz = { * Toggle the link wizard */ toggle: function(){ - if(dw_linkwiz.$wiz.hasClass('a11y')){ + if(dw_linkwiz.$wiz.css('display') == 'none'){ dw_linkwiz.show(); }else{ dw_linkwiz.hide(); -- cgit v1.2.3 From 04dd9c85e28535b43c7821841cd97b52682adae3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 28 Nov 2011 22:14:20 +0000 Subject: fixed link wizard being appended to every div.dokuwiki (FS#2395) and changed div.dokuwiki to just .dokuwiki (some templates have the class in the body) --- lib/scripts/linkwiz.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts/linkwiz.js') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index dcfafd75e..5075a0ab8 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -41,7 +41,7 @@ var dw_linkwiz = { 'left': (pos.left+80)+'px' }) .hide() - .appendTo('div.dokuwiki'); + .appendTo('.dokuwiki:first'); dw_linkwiz.textArea = $editor[0]; dw_linkwiz.result = jQuery('#link__wiz_result')[0]; -- cgit v1.2.3