diff options
| -rw-r--r-- | lib/scripts/edit.js | 2 | ||||
| -rw-r--r-- | lib/scripts/linkwiz.js | 28 | ||||
| -rw-r--r-- | lib/scripts/toolbar.js | 4 | ||||
| -rw-r--r-- | lib/styles/screen.css | 7 |
4 files changed, 22 insertions, 19 deletions
diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index bfbd698f1..33a8f61b5 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -64,7 +64,7 @@ function createPicker(id,props,edid){ // create the wrapping div var $picker = jQuery(document.createElement('div')); - $picker.addClass('picker hidden_with_access_keys'); + $picker.addClass('picker a11y'); if(props['class']){ $picker.addClass(props['class']); } diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index 6e0a00183..a9d517306 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -23,23 +23,23 @@ var dw_linkwiz = { // create HTML Structure dw_linkwiz.$wiz = jQuery(document.createElement('div')) + .dialog({autoOpen: false, draggable: true, title: LANG.linkwiz, + resizable: false, + }) + .html( + '<div>'+LANG.linkto+' <input type="text" class="edit" id="link__wiz_entry" autocomplete="off" /></div>'+ + '<div id="link__wiz_result"></div>' + ) + .parent() .attr('id','link__wiz') - .addClass('hidden_with_access_keys') + .addClass('a11y') .css({ 'position': 'absolute', 'top': (pos.top+20)+'px', 'left': (pos.left+80)+'px' }) - .html( - '<div id="link__wiz_header">'+ - '<img src="'+DOKU_BASE+'lib/images/close.png" width="16" height="16" align="right" alt="" id="link__wiz_close" />'+ - LANG.linkwiz+'</div>'+ - '<div>'+LANG.linkto+' <input type="text" class="edit" id="link__wiz_entry" autocomplete="off" /></div>'+ - '<div id="link__wiz_result"></div>' - ) - .addClass('picker'); + .show().appendTo('div.dokuwiki'); - $editor.parents('form').parent().append(dw_linkwiz.$wiz); dw_linkwiz.textArea = $editor[0]; dw_linkwiz.result = jQuery('#link__wiz_result')[0]; @@ -52,8 +52,6 @@ var dw_linkwiz = { jQuery('#link__wiz_close').click(dw_linkwiz.hide); dw_linkwiz.$entry.keyup(dw_linkwiz.onEntry); jQuery(dw_linkwiz.result).delegate('a', 'click', dw_linkwiz.onResultClick); - - dw_linkwiz.$wiz.draggable({handle: '#link__wiz_header'}); }, /** @@ -281,7 +279,7 @@ var dw_linkwiz = { */ show: function(){ dw_linkwiz.selection = getSelection(dw_linkwiz.textArea); - dw_linkwiz.$wiz.removeClass('hidden_with_access_keys'); + dw_linkwiz.$wiz.removeClass('a11y'); dw_linkwiz.$entry.focus(); dw_linkwiz.autocomplete(); }, @@ -290,7 +288,7 @@ var dw_linkwiz = { * Hide the link wizard */ hide: function(){ - dw_linkwiz.$wiz.addClass('hidden_with_access_keys'); + dw_linkwiz.$wiz.addClass('a11y'); dw_linkwiz.textArea.focus(); }, @@ -298,7 +296,7 @@ var dw_linkwiz = { * Toggle the link wizard */ toggle: function(){ - if(dw_linkwiz.$wiz.hasClass('hidden_with_access_keys')){ + if(dw_linkwiz.$wiz.hasClass('a11y')){ dw_linkwiz.show(); }else{ dw_linkwiz.hide(); diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js index 6cae9455a..04d30c1a6 100644 --- a/lib/scripts/toolbar.js +++ b/lib/scripts/toolbar.js @@ -229,7 +229,7 @@ function addBtnActionLinkwiz(btn, props, edid) { function pickerToggle(pickerid,$btn){ var $picker = jQuery('#' + pickerid), pos = $btn.offset(); - $picker.toggleClass('hidden_with_access_keys') + $picker.toggleClass('a11y') .offset({left: pos.left+3, top: pos.top+$btn[0].offsetHeight+3}); } @@ -239,7 +239,7 @@ function pickerToggle(pickerid,$btn){ * @author Andreas Gohr <andi@splitbrain.org> */ function pickerClose(){ - jQuery('.picker').addClass('hidden_with_access_keys'); + jQuery('.picker').addClass('a11y'); } diff --git a/lib/styles/screen.css b/lib/styles/screen.css index 6664c2102..218385f88 100644 --- a/lib/styles/screen.css +++ b/lib/styles/screen.css @@ -52,6 +52,11 @@ div.notify { overflow: hidden; } +#link__wiz .ui-dialog-content { + padding-left: 0; + padding-right: 0; +} + /* media manager popup toggle buttons */ #media__popup_content button.button { @@ -87,7 +92,7 @@ div.notify { .code .st0 { color: #ff0000; } .code .sy0 { color: #66cc66; } -.hidden_with_access_keys { +.a11y { /* No display: none to keep accesskeys working */ margin-left: -10000px !important; margin-top: -10000px !important; |