X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/e08b42e8ad054ec67522d7ac1aaae5dc68cb3d01..HEAD:/wp-includes/js/quicktags.js?ds=sidebyside diff --git a/wp-includes/js/quicktags.js b/wp-includes/js/quicktags.js index b55a55e3..6d00901a 100644 --- a/wp-includes/js/quicktags.js +++ b/wp-includes/js/quicktags.js @@ -1,4 +1,4 @@ -/* global adminpage, wpActiveEditor, quicktagsL10n, wpLink, fullscreen, prompt */ +/* global adminpage, wpActiveEditor, quicktagsL10n, wpLink, prompt */ /* * Quicktags * @@ -163,7 +163,7 @@ function edButton(id, display, tagStart, tagEnd, access) { id = settings.id, canvas = document.getElementById(id), name = 'qt_' + id, - tb, onclick, toolbar_id; + tb, onclick, toolbar_id, wrap, setActiveEditor; if ( !id || !canvas ) { return false; @@ -182,9 +182,13 @@ function edButton(id, display, tagStart, tagEnd, access) { toolbar_id = name + '_toolbar'; } - tb = document.createElement('div'); - tb.id = toolbar_id; - tb.className = 'quicktags-toolbar'; + tb = document.getElementById( toolbar_id ); + + if ( ! tb ) { + tb = document.createElement('div'); + tb.id = toolbar_id; + tb.className = 'quicktags-toolbar'; + } canvas.parentNode.insertBefore(tb, canvas); t.toolbar = tb; @@ -211,10 +215,24 @@ function edButton(id, display, tagStart, tagEnd, access) { } }; + setActiveEditor = function() { + window.wpActiveEditor = id; + }; + + wrap = document.getElementById( 'wp-' + id + '-wrap' ); + if ( tb.addEventListener ) { - tb.addEventListener('click', onclick, false); + tb.addEventListener( 'click', onclick, false ); + + if ( wrap ) { + wrap.addEventListener( 'click', setActiveEditor, false ); + } } else if ( tb.attachEvent ) { - tb.attachEvent('onclick', onclick); + tb.attachEvent( 'onclick', onclick ); + + if ( wrap ) { + wrap.attachEvent( 'onclick', setActiveEditor ); + } } t.getButton = function(id) { @@ -227,12 +245,18 @@ function edButton(id, display, tagStart, tagEnd, access) { qt.instances[id] = t; - if ( !qt.instances[0] ) { - qt.instances[0] = qt.instances[id]; + if ( ! qt.instances['0'] ) { + qt.instances['0'] = qt.instances[id]; _domReady( function(){ qt._buttonsInit(); } ); } }; + function _escape( text ) { + text = text || ''; + text = text.replace( /&([^#])(?![a-z1-4]{1,8};)/gi, '&$1' ); + return text.replace( //g, '>' ).replace( /"/g, '"' ).replace( /'/g, ''' ); + } + qt.instances = {}; qt.getInstance = function(id) { @@ -244,7 +268,7 @@ function edButton(id, display, tagStart, tagEnd, access) { defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,close,'; for ( inst in t.instances ) { - if ( inst === 0 ) { + if ( '0' === inst ) { continue; } @@ -280,12 +304,11 @@ function edButton(id, display, tagStart, tagEnd, access) { } } - if ( use && use.indexOf(',fullscreen,') !== -1 ) { - theButtons.fullscreen = new qt.FullscreenButton(); - html += theButtons.fullscreen.html(name + '_'); + if ( use && use.indexOf(',dfw,') !== -1 ) { + theButtons.dfw = new qt.DFWButton(); + html += theButtons.dfw.html( name + '_' ); } - if ( 'rtl' === document.getElementsByTagName('html')[0].dir ) { theButtons.textdirection = new qt.TextDirectionButton(); html += theButtons.textdirection.html(name + '_'); @@ -293,6 +316,10 @@ function edButton(id, display, tagStart, tagEnd, access) { ed.toolbar.innerHTML = html; ed.theButtons = theButtons; + + if ( typeof jQuery !== 'undefined' ) { + jQuery( document ).triggerHandler( 'quicktags-init', [ ed ] ); + } } t.buttonsInitDone = true; }; @@ -317,13 +344,14 @@ function edButton(id, display, tagStart, tagEnd, access) { * @param string display Required. Button's value="..." * @param string|function arg1 Required. Either a starting tag to be inserted like "" or a callback that is executed when the button is clicked. * @param string arg2 Optional. Ending tag like "" - * @param string access_key Optional. Access key for the button. + * @param string access_key Deprecated Not used * @param string title Optional. Button's title="..." * @param int priority Optional. Number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc. - * @param string instance Optional. Limit the button to a specifric instance of Quicktags, add to all instances if not present. + * @param string instance Optional. Limit the button to a specific instance of Quicktags, add to all instances if not present. + * @param attr object Optional. Used to pass additional attributes. Currently supports `ariaLabel` and `ariaLabelClose` (for "close tag" state) * @return mixed null or the button object that is needed for back-compat. */ - qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) { + qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance, attr ) { var btn; if ( !id || !display ) { @@ -332,12 +360,13 @@ function edButton(id, display, tagStart, tagEnd, access) { priority = priority || 0; arg2 = arg2 || ''; + attr = attr || {}; if ( typeof(arg1) === 'function' ) { - btn = new qt.Button(id, display, access_key, title, instance); + btn = new qt.Button( id, display, access_key, title, instance, attr ); btn.callback = arg1; } else if ( typeof(arg1) === 'string' ) { - btn = new qt.TagButton(id, display, arg1, arg2, access_key, title, instance); + btn = new qt.TagButton( id, display, arg1, arg2, access_key, title, instance, attr ); } else { return; } @@ -381,10 +410,10 @@ function edButton(id, display, tagStart, tagEnd, access) { canvas.value = text.substring(0, startPos) + content + text.substring(endPos, text.length); - canvas.focus(); canvas.selectionStart = startPos + content.length; canvas.selectionEnd = startPos + content.length; canvas.scrollTop = scrollTop; + canvas.focus(); } else { canvas.value += content; canvas.focus(); @@ -393,47 +422,69 @@ function edButton(id, display, tagStart, tagEnd, access) { }; // a plain, dumb button - qt.Button = function(id, display, access, title, instance) { - var t = this; - t.id = id; - t.display = display; - t.access = access; - t.title = title || ''; - t.instance = instance || ''; + qt.Button = function( id, display, access, title, instance, attr ) { + this.id = id; + this.display = display; + this.access = ''; + this.title = title || ''; + this.instance = instance || ''; + this.attr = attr || {}; }; qt.Button.prototype.html = function(idPrefix) { - var access = this.access ? ' accesskey="' + this.access + '"' : ''; - return ''; + var active, on, wp, + title = this.title ? ' title="' + _escape( this.title ) + '"' : '', + ariaLabel = this.attr && this.attr.ariaLabel ? ' aria-label="' + _escape( this.attr.ariaLabel ) + '"' : '', + val = this.display ? ' value="' + _escape( this.display ) + '"' : '', + id = this.id ? ' id="' + _escape( idPrefix + this.id ) + '"' : '', + dfw = ( wp = window.wp ) && wp.editor && wp.editor.dfw; + + if ( this.id === 'fullscreen' ) { + return ''; + } else if ( this.id === 'dfw' ) { + active = dfw && dfw.isActive() ? '' : ' disabled="disabled"'; + on = dfw && dfw.isOn() ? ' active' : ''; + + return ''; + } + + return ''; }; qt.Button.prototype.callback = function(){}; // a button that inserts HTML tag - qt.TagButton = function(id, display, tagStart, tagEnd, access, title, instance) { + qt.TagButton = function( id, display, tagStart, tagEnd, access, title, instance, attr ) { var t = this; - qt.Button.call(t, id, display, access, title, instance); + qt.Button.call( t, id, display, access, title, instance, attr ); t.tagStart = tagStart; t.tagEnd = tagEnd; }; qt.TagButton.prototype = new qt.Button(); - qt.TagButton.prototype.openTag = function(e, ed) { - var t = this; - + qt.TagButton.prototype.openTag = function( element, ed ) { if ( ! ed.openTags ) { ed.openTags = []; } - if ( t.tagEnd ) { - ed.openTags.push(t.id); - e.value = '/' + e.value; + + if ( this.tagEnd ) { + ed.openTags.push( this.id ); + element.value = '/' + element.value; + + if ( this.attr.ariaLabelClose ) { + element.setAttribute( 'aria-label', this.attr.ariaLabelClose ); + } } }; - qt.TagButton.prototype.closeTag = function(e, ed) { - var t = this, i = t.isOpen(ed); + qt.TagButton.prototype.closeTag = function( element, ed ) { + var i = this.isOpen(ed); if ( i !== false ) { - ed.openTags.splice(i, 1); + ed.openTags.splice( i, 1 ); } - e.value = t.display; + element.value = this.display; + + if ( this.attr.ariaLabel ) { + element.setAttribute( 'aria-label', this.attr.ariaLabel ); + } }; // whether a tag is open or not. Returns false if not open, or current open depth of the tag qt.TagButton.prototype.isOpen = function (ed) { @@ -475,6 +526,11 @@ function edButton(id, display, tagStart, tagEnd, access) { } else if ( canvas.selectionStart || canvas.selectionStart === 0 ) { // FF, WebKit, Opera startPos = canvas.selectionStart; endPos = canvas.selectionEnd; + + if ( startPos < endPos && v.charAt( endPos - 1 ) === '\n' ) { + endPos -= 1; + } + cursorPos = endPos; scrollTop = canvas.scrollTop; l = v.substring(0, startPos); // left of the selection @@ -503,10 +559,10 @@ function edButton(id, display, tagStart, tagEnd, access) { } } - canvas.focus(); canvas.selectionStart = cursorPos; canvas.selectionEnd = cursorPos; canvas.scrollTop = scrollTop; + canvas.focus(); } else { // other browsers? if ( !endTag ) { canvas.value += t.tagStart; @@ -526,7 +582,7 @@ function edButton(id, display, tagStart, tagEnd, access) { // the close tags button qt.CloseButton = function() { - qt.Button.call(this, 'close', quicktagsL10n.closeTags, '', quicktagsL10n.closeAllOpenTags); + qt.Button.call( this, 'close', quicktagsL10n.closeTags, '', quicktagsL10n.closeAllOpenTags ); }; qt.CloseButton.prototype = new qt.Button(); @@ -557,14 +613,18 @@ function edButton(id, display, tagStart, tagEnd, access) { // the link button qt.LinkButton = function() { - qt.TagButton.call(this, 'link', 'link', '', '', 'a'); + var attr = { + ariaLabel: quicktagsL10n.link + }; + + qt.TagButton.call( this, 'link', 'link', '', '', '', '', '', attr ); }; qt.LinkButton.prototype = new qt.TagButton(); qt.LinkButton.prototype.callback = function(e, c, ed, defaultValue) { var URL, t = this; - if ( typeof(wpLink) !== 'undefined' ) { - wpLink.open(); + if ( typeof wpLink !== 'undefined' ) { + wpLink.open( ed.id ); return; } @@ -573,7 +633,7 @@ function edButton(id, display, tagStart, tagEnd, access) { } if ( t.isOpen(ed) === false ) { - URL = prompt(quicktagsL10n.enterURL, defaultValue); + URL = prompt( quicktagsL10n.enterURL, defaultValue ); if ( URL ) { t.tagStart = ''; qt.TagButton.prototype.callback.call(t, e, c, ed); @@ -585,7 +645,11 @@ function edButton(id, display, tagStart, tagEnd, access) { // the img button qt.ImgButton = function() { - qt.TagButton.call(this, 'img', 'img', '', '', 'm'); + var attr = { + ariaLabel: quicktagsL10n.image + }; + + qt.TagButton.call( this, 'img', 'img', '', '', '', '', '', attr ); }; qt.ImgButton.prototype = new qt.TagButton(); qt.ImgButton.prototype.callback = function(e, c, ed, defaultValue) { @@ -600,20 +664,22 @@ function edButton(id, display, tagStart, tagEnd, access) { } }; - qt.FullscreenButton = function() { - qt.Button.call(this, 'fullscreen', quicktagsL10n.fullscreen, 'f', quicktagsL10n.toggleFullscreen); + qt.DFWButton = function() { + qt.Button.call( this, 'dfw', '', 'f', quicktagsL10n.dfw ); }; - qt.FullscreenButton.prototype = new qt.Button(); - qt.FullscreenButton.prototype.callback = function(e, c) { - if ( !c.id || typeof(fullscreen) === 'undefined' ) { + qt.DFWButton.prototype = new qt.Button(); + qt.DFWButton.prototype.callback = function() { + var wp; + + if ( ! ( wp = window.wp ) || ! wp.editor || ! wp.editor.dfw ) { return; } - fullscreen.on(); + window.wp.editor.dfw.toggle(); }; qt.TextDirectionButton = function() { - qt.Button.call(this, 'textdirection', quicktagsL10n.textdirection, '', quicktagsL10n.toggleTextdirection); + qt.Button.call( this, 'textdirection', quicktagsL10n.textdirection, '', quicktagsL10n.toggleTextdirection ); }; qt.TextDirectionButton.prototype = new qt.Button(); qt.TextDirectionButton.prototype.callback = function(e, c) { @@ -629,18 +695,18 @@ function edButton(id, display, tagStart, tagEnd, access) { }; // ensure backward compatibility - edButtons[10] = new qt.TagButton('strong','b','','','b'); - edButtons[20] = new qt.TagButton('em','i','','','i'), - edButtons[30] = new qt.LinkButton(), // special case - edButtons[40] = new qt.TagButton('block','b-quote','\n\n
','
\n\n','q'), - edButtons[50] = new qt.TagButton('del','del','','','d'), - edButtons[60] = new qt.TagButton('ins','ins','','','s'), - edButtons[70] = new qt.ImgButton(), // special case - edButtons[80] = new qt.TagButton('ul','ul','\n\n','u'), - edButtons[90] = new qt.TagButton('ol','ol','
    \n','
\n\n','o'), - edButtons[100] = new qt.TagButton('li','li','\t
  • ','
    • \n','l'), - edButtons[110] = new qt.TagButton('code','code','','','c'), - edButtons[120] = new qt.TagButton('more','more','','','t'), + edButtons[10] = new qt.TagButton( 'strong', 'b', '', '', '', '', '', { ariaLabel: quicktagsL10n.strong, ariaLabelClose: quicktagsL10n.strongClose } ); + edButtons[20] = new qt.TagButton( 'em', 'i', '', '', '', '', '', { ariaLabel: quicktagsL10n.em, ariaLabelClose: quicktagsL10n.emClose } ); + edButtons[30] = new qt.LinkButton(); // special case + edButtons[40] = new qt.TagButton( 'block', 'b-quote', '\n\n
    ', '
    \n\n', '', '', '', { ariaLabel: quicktagsL10n.blockquote, ariaLabelClose: quicktagsL10n.blockquoteClose } ); + edButtons[50] = new qt.TagButton( 'del', 'del', '', '', '', '', '', { ariaLabel: quicktagsL10n.del, ariaLabelClose: quicktagsL10n.delClose } ); + edButtons[60] = new qt.TagButton( 'ins', 'ins', '', '', '', '', '', { ariaLabel: quicktagsL10n.ins, ariaLabelClose: quicktagsL10n.insClose } ); + edButtons[70] = new qt.ImgButton(); // special case + edButtons[80] = new qt.TagButton( 'ul', 'ul', '\n\n', '', '', '', { ariaLabel: quicktagsL10n.ul, ariaLabelClose: quicktagsL10n.ulClose } ); + edButtons[90] = new qt.TagButton( 'ol', 'ol', '
      \n', '
    \n\n', '', '', '', { ariaLabel: quicktagsL10n.ol, ariaLabelClose: quicktagsL10n.olClose } ); + edButtons[100] = new qt.TagButton( 'li', 'li', '\t
  • ', '
    • \n', '', '', '', { ariaLabel: quicktagsL10n.li, ariaLabelClose: quicktagsL10n.liClose } ); + edButtons[110] = new qt.TagButton( 'code', 'code', '', '', '', '', '', { ariaLabel: quicktagsL10n.code, ariaLabelClose: quicktagsL10n.codeClose } ); + edButtons[120] = new qt.TagButton( 'more', 'more', '\n\n', '', '', '', '', { ariaLabel: quicktagsL10n.more } ); edButtons[140] = new qt.CloseButton(); })();