<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[19172] trunk/wp-includes: Improve handling of init and adding buttons to Quicktags, fixes #19098</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19172">19172</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-11-05 16:00:38 +0000 (Sat, 05 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve handling of init and adding buttons to Quicktags, fixes <a href="http://core.trac.wordpress.org/ticket/19098">#19098</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpeditorphp">trunk/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunkwpincludesjsquicktagsdevjs">trunk/wp-includes/js/quicktags.dev.js</a></li>
<li><a href="#trunkwpincludesjsquicktagsjs">trunk/wp-includes/js/quicktags.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-editor.php (19171 => 19172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-editor.php 2011-11-05 13:35:48 UTC (rev 19171)
+++ trunk/wp-includes/class-wp-editor.php 2011-11-05 16:00:38 UTC (rev 19172)
</span><span class="lines">@@ -139,35 +139,25 @@
</span><span class="cx"> $first_run = false;
</span><span class="cx">
</span><span class="cx"> if ( $this->this_quicktags ) {
</span><del>- $qt_buttons = array();
</del><span class="cx">
</span><span class="cx"> $qtInit = array(
</span><span class="cx"> 'id' => $editor_id,
</span><del>- 'buttons' => '',
- 'disabled_buttons' => ''
</del><ins>+ 'buttons' => ''
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( is_array($set['quicktags']) )
</span><span class="cx"> $qtInit = array_merge($qtInit, $set['quicktags']);
</span><span class="cx">
</span><del>- $qtInit = apply_filters( 'quicktags_settings', $qtInit, $editor_id );
</del><ins>+ if ( empty($qtInit['buttons']) )
+ $qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close';
</ins><span class="cx">
</span><del>- $this->qt_settings[$editor_id] = $qtInit;
-
- if ( !empty($qtInit['buttons']) || !empty($qtInit['disabled_buttons']) ) {
- if ( strpos( ',' . $qtInit['buttons'] . ',', ',link,' ) !== false )
- $qt_buttons[] = 'link';
-
- if ( strpos( ',' . $qtInit['disabled_buttons'] . ',', ',link,' ) !== false )
- $qt_buttons = array();
- } else {
- $qt_buttons[] = 'link';
- }
-
</del><span class="cx"> if ( $set['dfw'] )
</span><del>- $qt_buttons[] = 'fullscreen';
</del><ins>+ $qtInit['buttons'] .= ',fullscreen';
</ins><span class="cx">
</span><del>- $this->qt_buttons = array_merge( $this->qt_buttons, $qt_buttons );
</del><ins>+ $qtInit = apply_filters('quicktags_settings', $qtInit, $editor_id);
+ $this->qt_settings[$editor_id] = $qtInit;
+
+ $this->qt_buttons = array_merge( $this->qt_buttons, explode(',', $qtInit['buttons']) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $this->this_tinymce ) {
</span></span></pre></div>
<a id="trunkwpincludesjsquicktagsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/quicktags.dev.js (19171 => 19172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/quicktags.dev.js 2011-11-05 13:35:48 UTC (rev 19171)
+++ trunk/wp-includes/js/quicktags.dev.js 2011-11-05 16:00:38 UTC (rev 19172)
</span><span class="lines">@@ -7,19 +7,15 @@
</span><span class="cx"> * Run quicktags(settings) to initialize it, where settings is an object containing up to 3 properties:
</span><span class="cx"> * settings = {
</span><span class="cx"> * id : 'my_id', // the HTML ID of the textarea, required
</span><del>- * buttons: '', // Comma separated list of the names of the default buttons to show. Optional.
</del><ins>+ * buttons: '' // Comma separated list of the names of the default buttons to show. Optional.
</ins><span class="cx"> * // This overwrites buttons order and any buttons added by plugins.
</span><span class="cx"> * // Current list of default button names: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close'
</span><del>- * disabled_buttons : '' // Comma separated list of the names of the buttons to disable.
</del><span class="cx"> * }
</span><span class="cx"> *
</span><span class="cx"> * The settings can also be a string quicktags_id.
</span><span class="cx"> *
</span><span class="cx"> * quicktags_id The ID of the textarea that will be the editor canvas
</span><del>- * buttons Comma separated list of the buttons IDs that will be shown. Buttons added by plugins
- * will not show. Default: 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close'
- * disabled_buttons Comma separated list of the buttons IDs that should be excluded. Buttons
- * added by plugins will show unless specifically disabled.
</del><ins>+ * buttons Comma separated list of the buttons IDs that will be shown. Buttons added from JavaScript by plugins will not show.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> // new edit toolbar used with permission
</span><span class="lines">@@ -147,8 +143,6 @@
</span><span class="cx"> zeroise( now.getUTCSeconds() ) +
</span><span class="cx"> '+00:00';
</span><span class="cx"> })(),
</span><del>-
- _customButtons = {},
</del><span class="cx"> qt;
</span><span class="cx">
</span><span class="cx"> qt = QTags = function(settings) {
</span><span class="lines">@@ -192,7 +186,7 @@
</span><span class="cx"> var target = e.target || e.srcElement, i;
</span><span class="cx">
</span><span class="cx"> // as long as it has the class ed_button, execute the callback
</span><del>- if ( /\s+ed_button\s+/.test(' ' + target.className + ' ' ) ) {
</del><ins>+ if ( / ed_button /.test(' ' + target.className + ' ') ) {
</ins><span class="cx"> // we have to reassign canvas here
</span><span class="cx"> t.canvas = canvas = document.getElementById(id);
</span><span class="cx"> i = target.id.replace(name + '_', '');
</span><span class="lines">@@ -226,68 +220,41 @@
</span><span class="cx">
</span><span class="cx"> qt.instances = {};
</span><span class="cx">
</span><del>- qt.registerButton = function(id, btnClass) {
- _customButtons[id] = btnClass;
- };
-
</del><span class="cx"> qt.getInstance = function(id) {
</span><span class="cx"> return qt.instances[id];
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> qt._buttonsInit = function() {
</span><del>- var t = this, instance, canvas, name, settings, buttons, theButtons, html, id, i, qb, btn;
</del><ins>+ var t = this, canvas, name, settings, theButtons, html, inst, ed, id, i, use = '',
+ defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close,';
</ins><span class="cx">
</span><del>- for ( id in t.instances ) {
- if ( id == 0 )
</del><ins>+ for ( inst in t.instances ) {
+ if ( inst == 0 )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- instance = t.instances[id];
- canvas = instance.canvas;
- name = instance.name;
- settings = instance.settings;
</del><ins>+ ed = t.instances[inst];
+ canvas = ed.canvas;
+ name = ed.name;
+ settings = ed.settings;
</ins><span class="cx"> html = '';
</span><del>- buttons = {};
</del><span class="cx"> theButtons = {};
</span><span class="cx">
</span><span class="cx"> // set buttons
</span><ins>+ if ( settings.buttons )
+ use = ','+settings.buttons+',';
+
</ins><span class="cx"> for ( i in edButtons ) {
</span><span class="cx"> if ( !edButtons[i] )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- buttons[edButtons[i].id] = edButtons[i];
- }
</del><ins>+ id = edButtons[i].id;
+ if ( use && defaults.indexOf(','+id+',') != -1 && use.indexOf(','+id+',') == -1 )
+ continue;
</ins><span class="cx">
</span><del>- if ( id == 'content' && typeof(adminpage) == 'string' && ( adminpage == 'post-new-php' || adminpage == 'post-php' ) )
- buttons['fullscreen'] = new qt.FullscreenButton();
-
- // add custom buttons
- for ( i in t._customButtons ) {
- if ( !buttons[i] )
- buttons[i] = new t._customButtons[i]();
</del><ins>+ if ( !edButtons[i].instance || edButtons[i].instance == inst )
+ theButtons[id] = edButtons[i];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( settings.buttons ) {
- qb = settings.buttons.split(',');
-
- for ( i in qb ) {
- btn = qb[i];
- if ( buttons[btn] )
- theButtons[btn] = buttons[btn];
- }
- } else {
- theButtons = buttons;
- }
-
- if ( settings.disabled_buttons ) {
- qb = settings.disabled_buttons.split(',');
-
- for ( i in qb ) {
- btn = qb[i];
- if ( theButtons[btn] )
- delete(theButtons[btn]);
- }
- }
-
</del><span class="cx"> for ( i in theButtons ) {
</span><span class="cx"> if ( !theButtons[i] || !theButtons[i].html )
</span><span class="cx"> continue;
</span><span class="lines">@@ -295,8 +262,8 @@
</span><span class="cx"> html += theButtons[i].html(name + '_');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- instance.toolbar.innerHTML = html;
- instance.theButtons = theButtons;
</del><ins>+ ed.toolbar.innerHTML = html;
+ ed.theButtons = theButtons;
</ins><span class="cx"> }
</span><span class="cx"> t.buttonsInitDone = true;
</span><span class="cx"> };
</span><span class="lines">@@ -315,18 +282,19 @@
</span><span class="cx"> *
</span><span class="cx"> * Minimum required to add a button that inserts a tag:
</span><span class="cx"> * QTags.addButton( 'my_id', 'my button', '<span>', '</span>' );
</span><del>- * QTags.addButton( 'my_id', 'my button', '<br />' );
</del><ins>+ * QTags.addButton( 'my_id2', 'my button', '<br />' );
</ins><span class="cx"> *
</span><span class="cx"> * @param id string required Button HTML ID
</span><span class="cx"> * @param display string required Button's value="..."
</span><span class="cx"> * @param arg1 string || function required Either a starting tag to be inserted like "<span>" or a callback that is executed when the button is clicked.
</span><del>- * @param arg2 string Ending tag like "</span>"
- * @param access_key string Access key for the button
- * @param title string Button's title="..."
- * @param priority int Number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc.
- * @return mixed null or the button object that is needed for back-compat. The common method of adding a button was to manually add it to the buttons array.
</del><ins>+ * @param arg2 string optional Ending tag like "</span>"
+ * @param access_key string optional Access key for the button.
+ * @param title string optional Button's title="..."
+ * @param priority int optional Number representing the desired position of the button in the toolbar. 1 - 9 = first, 11 - 19 = second, 21 - 29 = third, etc.
+ * @param instance string optional Limit the button to a specifric instance of Quicktags, add to all instances if not present.
+ * @return mixed null or the button object that is needed for back-compat.
</ins><span class="cx"> */
</span><del>- qt.addButton = function( id, display, arg1, arg2, access_key, title, priority ) {
</del><ins>+ qt.addButton = function( id, display, arg1, arg2, access_key, title, priority, instance ) {
</ins><span class="cx"> var btn;
</span><span class="cx">
</span><span class="cx"> if ( !id || !display )
</span><span class="lines">@@ -336,10 +304,10 @@
</span><span class="cx"> arg2 = arg2 || '';
</span><span class="cx">
</span><span class="cx"> if ( typeof(arg1) === 'function' ) {
</span><del>- btn = new qt.Button(id, display, access_key, title);
</del><ins>+ btn = new qt.Button(id, display, access_key, title, instance);
</ins><span class="cx"> btn.callback = arg1;
</span><span class="cx"> } else if ( typeof(arg1) === 'string' ) {
</span><del>- btn = new qt.TagButton(id, display, arg1, arg2, access_key, title);
</del><ins>+ btn = new qt.TagButton(id, display, arg1, arg2, access_key, title, instance);
</ins><span class="cx"> } else {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -392,12 +360,13 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // a plain, dumb button
</span><del>- qt.Button = function(id, display, access, title) {
</del><ins>+ qt.Button = function(id, display, access, title, instance) {
</ins><span class="cx"> var t = this;
</span><span class="cx"> t.id = id;
</span><span class="cx"> t.display = display;
</span><span class="cx"> t.access = access;
</span><span class="cx"> t.title = title || '';
</span><ins>+ t.instance = instance || '';
</ins><span class="cx"> };
</span><span class="cx"> qt.Button.prototype.html = function(idPrefix) {
</span><span class="cx"> var access = this.access ? ' accesskey="' + this.access + '"' : '';
</span><span class="lines">@@ -406,9 +375,9 @@
</span><span class="cx"> qt.Button.prototype.callback = function(){};
</span><span class="cx">
</span><span class="cx"> // a button that inserts HTML tag
</span><del>- qt.TagButton = function(id, display, tagStart, tagEnd, access, title) {
</del><ins>+ qt.TagButton = function(id, display, tagStart, tagEnd, access, title, instance) {
</ins><span class="cx"> var t = this;
</span><del>- qt.Button.call(t, id, display, access, title);
</del><ins>+ qt.Button.call(t, id, display, access, title, instance);
</ins><span class="cx"> t.tagStart = tagStart;
</span><span class="cx"> t.tagEnd = tagEnd;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkwpincludesjsquicktagsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/quicktags.js (19171 => 19172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/quicktags.js 2011-11-05 13:35:48 UTC (rev 19171)
+++ trunk/wp-includes/js/quicktags.js 2011-11-05 16:00:38 UTC (rev 19172)
</span><span class="lines">@@ -1 +1 @@
</span><del>-var QTags,edButtons=[],edCanvas,edAddTag=function(){},edCheckOpenTags=function(){},edCloseAllTags=function(){},edInsertImage=function(){},edInsertLink=function(){},edInsertTag=function(){},edLink=function(){},edQuickLink=function(){},edRemoveTag=function(){},edShowButton=function(){},edShowLinks=function(){},edSpell=function(){},edToolbar=function(){};function quicktags(a){return new QTags(a)}function edInsertContent(b,a){return QTags.insertContent(a)}function edButton(f,e,c,b,a,d){return QTags.addButton(f,e,c,b,a,"",-1)}(function(){var c=function(h){var g,f,e;if(typeof jQuery!="undefined"){jQuery(document).ready(h)}else{g=c;g.funcs=[];g.ready=function(){if(!g.isReady){g.isReady=true;for(f=0;f<g.funcs.length;f++){g.funcs[f]()}}};if(g.isReady){h()}else{g.funcs.push(h)}if(!g.eventAttached){if(document.addEventListener){e=function(){document.removeEventListener("DOMContentLoaded",e,false);g.ready()};document.addEventListener("DO
MContentLoaded",e,false);window.addEventListener("load",g.ready,false)}else{if(document.attachEvent){e=function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",e);g.ready()}};document.attachEvent("onreadystatechange",e);window.attachEvent("onload",g.ready);(function(){try{document.documentElement.doScroll("left")}catch(i){setTimeout(arguments.callee,50);return}g.ready()})()}}g.eventAttached=true}}},a=(function(){var e=new Date(),f;f=function(g){var h=g.toString();if(h.length<2){h="0"+h}return h};return e.getUTCFullYear()+"-"+f(e.getUTCMonth()+1)+"-"+f(e.getUTCDate())+"T"+f(e.getUTCHours())+":"+f(e.getUTCMinutes())+":"+f(e.getUTCSeconds())+"+00:00"})(),b={},d;d=QTags=function(k){if(typeof(k)=="string"){k={id:k}}else{if(typeof(k)!="object"){return false}}var j=this,l=k.id,i=document.getEle
mentById(l),h="qt_"+l,e,g,f;if(!l||!i){return false}j.name=h;j.id=l;j.canvas=i;j.settings=k;if(l=="content"&&typeof(adminpage)=="string"&&(adminpage=="post-new-php"||adminpage=="post-php")){edCanvas=i;f="ed_toolbar"}else{f=h+"_toolbar"}e=document.createElement("div");e.id=f;e.className="quicktags-toolbar";i.parentNode.insertBefore(e,i);j.toolbar=e;g=function(o){o=o||window.event;var n=o.target||o.srcElement,m;if(/\s+ed_button\s+/.test(" "+n.className+" ")){j.canvas=i=document.getElementById(l);m=n.id.replace(h+"_","");if(j.theButtons[m]){j.theButtons[m].callback.call(j.theButtons[m],n,i,j)}}};if(e.addEventListener){e.addEventListener("click",g,false)}else{if(e.attachEvent){e.attachEvent("onclick",g)}}j.getButton=function(m){return j.theButtons[m]};j.getButtonElement=function(m){return document.getElementById(h+&
quot;_"+m)};d.instances[l]=j;if(!d.instances[0]){d.instances[0]=d.instances[l];c(function(){d._buttonsInit()})}};d.instances={};d.registerButton=function(f,e){b[f]=e};d.getInstance=function(e){return d.instances[e]};d._buttonsInit=function(){var q=this,p,h,e,j,o,n,m,f,l,k,g;for(f in q.instances){if(f==0){continue}p=q.instances[f];h=p.canvas;e=p.name;j=p.settings;m="";o={};n={};for(l in edButtons){if(!edButtons[l]){continue}o[edButtons[l].id]=edButtons[l]}if(f=="content"&&typeof(adminpage)=="string"&&(adminpage=="post-new-php"||adminpage=="post-php")){o.fullscreen=new d.FullscreenButton()}for(l in q._customButtons){if(!o[l]){o[l]=new q._customButtons[l]()}}if(j.buttons){k=j.buttons.split(",");for(l in k){g=k[l];if(o[g]){n[g]=o[g]}}}else{n=o}if(j.disabled_buttons){k=j.disabled_buttons.split(",");for(l in k){g=k[l];if(n[g]){delete (n[g])}}}for(l in n){if(!n[l]||!n[l].html){continue}m+=n[l
].html(e+"_")}p.toolbar.innerHTML=m;p.theButtons=n}q.buttonsInitDone=true};d.addButton=function(l,j,f,e,i,k,h){var g;if(!l||!j){return}h=h||0;e=e||"";if(typeof(f)==="function"){g=new d.Button(l,j,i,k);g.callback=f}else{if(typeof(f)==="string"){g=new d.TagButton(l,j,f,e,i,k)}else{return}}if(h==-1){return g}if(h>0){while(typeof(edButtons[h])!="undefined"){h++}edButtons[h]=g}else{edButtons[edButtons.length]=g}if(this.buttonsInitDone){this._buttonsInit()}};d.insertContent=function(h){var i,g,f,j,k,e=document.getElementById(wpActiveEditor);if(!e){return false}if(document.selection){e.focus();i=document.selection.createRange();i.text=h;e.focus()}else{if(e.selectionStart||e.selectionStart=="0"){k=e.value;g=e.selectionStart;f=e.selectionEnd;j=e.scrollTop;e.value=k.substring(0,g)+h+k.substring(f,k.length);e.focus();e.selectionStart=g+h.length;e.selectionEnd=g+h.length;e.scrollTop=j}else{e.value+=h;e.focus()}}return true};
d.Button=function(i,g,e,h){var f=this;f.id=i;f.display=g;f.access=e;f.title=h||""};d.Button.prototype.html=function(f){var e=this.access?' accesskey="'+this.access+'"':"";return'<input type="button" id="'+f+this.id+'"'+e+' class="ed_button" title="'+this.title+'" value="'+this.display+'" />'};d.Button.prototype.callback=function(){};d.TagButton=function(k,i,g,f,e,j){var h=this;d.Button.call(h,k,i,e,j);h.tagStart=g;h.tagEnd=f};d.TagButton.prototype=new d.Button();d.TagButton.prototype.openTag=function(h,f){var g=this;if(!f.openTags){f.openTags=[]}if(g.tagEnd){f.openTags.push(g.id);h.value="/"+h.value}};d.TagButton.prototype.closeTag=function(j,f){var h=this,g=h.isOpen(f);if(g!==false){f.openTags.splice(g,1)}j.value=h.display};d.TagButton.prototype.isOpen=function(e){var h=this,g=0,f=false;if(e.openTags){while(f===false&&g<e.openTags.length){f=e.openTags[g]==h.id?g:false;
g++}}else{f=false}return f};d.TagButton.prototype.callback=function(p,j,q){var w=this,s,f,n,h,u=j.value,k,e,o,g,m=u?w.tagEnd:"";if(document.selection){j.focus();g=document.selection.createRange();if(g.text.length>0){if(!w.tagEnd){g.text=g.text+w.tagStart}else{g.text=w.tagStart+g.text+m}}else{if(!w.tagEnd){g.text=w.tagStart}else{if(w.isOpen(q)===false){g.text=w.tagStart;w.openTag(p,q)}else{g.text=m;w.closeTag(p,q)}}}j.focus()}else{if(j.selectionStart||j.selectionStart=="0"){s=j.selectionStart;f=j.selectionEnd;n=f;h=j.scrollTop;k=u.substring(0,s);e=u.substring(f,u.length);o=u.substring(s,f);if(s!=f){if(!w.tagEnd){j.value=k+o+w.tagStart+e;n+=w.tagStart.length}else{j.value=k+w.tagStart+o+m+e;n+=w.tagStart.length+m.length}}else{if(!w.tagEnd){j.value=k+w.tagStart+e;n=s+w.tagStart.length}else{if(w.isOpen(q)===false){j.value=k+w.tagStart+e;w.openTag(p,q);n=s+w.tagStart.length}else{j.value=k+m+e;n=s+m.length;w.closeTag(p,q)}}}j.focus();j.selectionStart=n;j.sele
ctionEnd=n;j.scrollTop=h}else{if(!m){j.value+=w.tagStart}else{if(w.isOpen(q)!==false){j.value+=w.tagStart;w.openTag(p,q)}else{j.value+=m;w.closeTag(p,q)}}j.focus()}}};d.SpellButton=function(){d.Button.call(this,"spell",quicktagsL10n.lookup,"",quicktagsL10n.dictionaryLookup)};d.SpellButton.prototype=new d.Button();d.SpellButton.prototype.callback=function(i,h,e){var k="",j,g,f;if(document.selection){h.focus();j=document.selection.createRange();if(j.text.length>0){k=j.text}}else{if(h.selectionStart||h.selectionStart=="0"){g=h.selectionStart;f=h.selectionEnd;if(g!=f){k=h.value.substring(g,f)}}}if(k===""){k=prompt(quicktagsL10n.wordLookup,"")}if(k!==null&&/^\w[\w ]*$/.test(k)){window.open("http://www.answers.com/"+encodeURIComponent(k))}};d.CloseButton=function(){d.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)};d.CloseButton.prototype=new d.B
utton();d._close=function(j,k,f){var h,g,i=f.openTags;if(i){while(i.length>0){h=f.getButton(i[i.length-1]);g=document.getElementById(f.name+"_"+h.id);h.callback.call(h,g,k,f)}}};d.CloseButton.prototype.callback=d._close;d.closeAllTags=function(f){var e=this.getInstance(f);d._close("",e.canvas,e)};d.LinkButton=function(){d.TagButton.call(this,"link","link","","</a>","a")};d.LinkButton.prototype=new d.TagButton();d.LinkButton.prototype.callback=function(j,k,h,g){var f,i=this;if(typeof(wpLink)!="undefined"){wpLink.open();return}if(!g){g="http://"}if(i.isOpen(h)===false){f=prompt(quicktagsL10n.enterURL,g);if(f){i.tagStart='<a href="'+f+'">';d.TagButton.prototype.callback.call(i,j,k,h)}}else{d.TagButton.prototype.callback.call(i,j,k,h)}};d.ImgButton=function(){d.TagButton.call(this,"img","img","","","m")};d.ImgButton.
prototype=new d.TagButton();d.ImgButton.prototype.callback=function(i,k,g,f){if(!f){f="http://"}var j=prompt(quicktagsL10n.enterImageURL,f),h;if(j){h=prompt(quicktagsL10n.enterImageDescription,"");this.tagStart='<img src="'+j+'" alt="'+h+'" />';d.TagButton.prototype.callback.call(this,i,k,g)}};d.FullscreenButton=function(){d.Button.call(this,"fullscreen",quicktagsL10n.fullscreen,"f",quicktagsL10n.toggleFullscreen)};d.FullscreenButton.prototype=new d.Button();d.FullscreenButton.prototype.callback=function(f,g){if(g.id!="content"||typeof(fullscreen)=="undefined"){return}fullscreen.on()};edButtons[10]=new d.TagButton("strong","b","<strong>","</strong>","b");edButtons[20]=new d.TagButton("em","i","<em>","</em>","i"),edButtons[30]=new d.LinkButton(),edButtons[40]=new d.TagB
utton("block","b-quote","\n\n<blockquote>","</blockquote>\n\n","q"),edButtons[50]=new d.TagButton("del","del",'<del datetime="'+a+'">',"</del>","d"),edButtons[60]=new d.TagButton("ins","ins",'<ins datetime="'+a+'">',"</ins>","s"),edButtons[70]=new d.ImgButton(),edButtons[80]=new d.TagButton("ul","ul","<ul>\n","</ul>\n\n","u"),edButtons[90]=new d.TagButton("ol","ol","<ol>\n","</ol>\n\n","o"),edButtons[100]=new d.TagButton("li","li","\t<li>","</li>\n","l"),edButtons[110]=new d.TagButton("code","code","<code>","</code>","c"),edButtons[120]=new d.TagBut
ton("more","more","<!--more-->","","t"),edButtons[130]=new d.SpellButton(),edButtons[140]=new d.CloseButton()})();
</del><span class="cx">\ No newline at end of file
</span><ins>+var QTags,edButtons=[],edCanvas,edAddTag=function(){},edCheckOpenTags=function(){},edCloseAllTags=function(){},edInsertImage=function(){},edInsertLink=function(){},edInsertTag=function(){},edLink=function(){},edQuickLink=function(){},edRemoveTag=function(){},edShowButton=function(){},edShowLinks=function(){},edSpell=function(){},edToolbar=function(){};function quicktags(a){return new QTags(a)}function edInsertContent(b,a){return QTags.insertContent(a)}function edButton(f,e,c,b,a,d){return QTags.addButton(f,e,c,b,a,"",-1)}(function(){var b=function(g){var f,e,d;if(typeof jQuery!="undefined"){jQuery(document).ready(g)}else{f=b;f.funcs=[];f.ready=function(){if(!f.isReady){f.isReady=true;for(e=0;e<f.funcs.length;e++){f.funcs[e]()}}};if(f.isReady){g()}else{f.funcs.push(g)}if(!f.eventAttached){if(document.addEventListener){d=function(){document.removeEventListener("DOMContentLoaded",d,false);f.ready()};document.addEventListener("DO
MContentLoaded",d,false);window.addEventListener("load",f.ready,false)}else{if(document.attachEvent){d=function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",d);f.ready()}};document.attachEvent("onreadystatechange",d);window.attachEvent("onload",f.ready);(function(){try{document.documentElement.doScroll("left")}catch(h){setTimeout(arguments.callee,50);return}f.ready()})()}}f.eventAttached=true}}},a=(function(){var d=new Date(),e;e=function(f){var g=f.toString();if(g.length<2){g="0"+g}return g};return d.getUTCFullYear()+"-"+e(d.getUTCMonth()+1)+"-"+e(d.getUTCDate())+"T"+e(d.getUTCHours())+":"+e(d.getUTCMinutes())+":"+e(d.getUTCSeconds())+"+00:00"})(),c;c=QTags=function(j){if(typeof(j)=="string"){j={id:j}}else{if(typeof(j)!="object"){return false}}var i=this,k=j.id,h=document.getElementB
yId(k),g="qt_"+k,d,f,e;if(!k||!h){return false}i.name=g;i.id=k;i.canvas=h;i.settings=j;if(k=="content"&&typeof(adminpage)=="string"&&(adminpage=="post-new-php"||adminpage=="post-php")){edCanvas=h;e="ed_toolbar"}else{e=g+"_toolbar"}d=document.createElement("div");d.id=e;d.className="quicktags-toolbar";h.parentNode.insertBefore(d,h);i.toolbar=d;f=function(n){n=n||window.event;var m=n.target||n.srcElement,l;if(/ ed_button /.test(" "+m.className+" ")){i.canvas=h=document.getElementById(k);l=m.id.replace(g+"_","");if(i.theButtons[l]){i.theButtons[l].callback.call(i.theButtons[l],m,h,i)}}};if(d.addEventListener){d.addEventListener("click",f,false)}else{if(d.attachEvent){d.attachEvent("onclick",f)}}i.getButton=function(l){return i.theButtons[l]};i.getButtonElement=function(l){return document.getElementById(g+"_&qu
ot;+l)};c.instances[k]=i;if(!c.instances[0]){c.instances[0]=c.instances[k];b(function(){c._buttonsInit()})}};c.instances={};c.getInstance=function(d){return c.instances[d]};c._buttonsInit=function(){var p=this,g,e,h,o,m,l,n,f,k,d="",j=",strong,em,link,block,del,ins,img,ul,ol,li,code,more,spell,close,";for(l in p.instances){if(l==0){continue}n=p.instances[l];g=n.canvas;e=n.name;h=n.settings;m="";o={};if(h.buttons){d=","+h.buttons+","}for(k in edButtons){if(!edButtons[k]){continue}f=edButtons[k].id;if(d&&j.indexOf(","+f+",")!=-1&&d.indexOf(","+f+",")==-1){continue}if(!edButtons[k].instance||edButtons[k].instance==l){o[f]=edButtons[k]}}for(k in o){if(!o[k]||!o[k].html){continue}m+=o[k].html(e+"_")}n.toolbar.innerHTML=m;n.theButtons=o}p.buttonsInitDone=true};c.addButton=function(e,i,h,g,d,j,k,l){var f;if(!e||!i){return}k=k||0;g=g||"";if(typeof(h)==="
function"){f=new c.Button(e,i,d,j,l);f.callback=h}else{if(typeof(h)==="string"){f=new c.TagButton(e,i,h,g,d,j,l)}else{return}}if(k==-1){return f}if(k>0){while(typeof(edButtons[k])!="undefined"){k++}edButtons[k]=f}else{edButtons[edButtons.length]=f}if(this.buttonsInitDone){this._buttonsInit()}};c.insertContent=function(g){var h,f,e,i,j,d=document.getElementById(wpActiveEditor);if(!d){return false}if(document.selection){d.focus();h=document.selection.createRange();h.text=g;d.focus()}else{if(d.selectionStart||d.selectionStart=="0"){j=d.value;f=d.selectionStart;e=d.selectionEnd;i=d.scrollTop;d.value=j.substring(0,f)+g+j.substring(e,j.length);d.focus();d.selectionStart=f+g.length;d.selectionEnd=f+g.length;d.scrollTop=i}else{d.value+=g;d.focus()}}return true};c.Button=function(i,g,e,h,d){var f=this;f.id=i;f.display=g;f.access=e;f.title=h||"";f.instance=d||""};c.Button.prototype.html=function(e){var d=this.access?' accesskey
="'+this.access+'"':"";return'<input type="button" id="'+e+this.id+'"'+d+' class="ed_button" title="'+this.title+'" value="'+this.display+'" />'};c.Button.prototype.callback=function(){};c.TagButton=function(k,i,g,f,e,j,d){var h=this;c.Button.call(h,k,i,e,j,d);h.tagStart=g;h.tagEnd=f};c.TagButton.prototype=new c.Button();c.TagButton.prototype.openTag=function(g,d){var f=this;if(!d.openTags){d.openTags=[]}if(f.tagEnd){d.openTags.push(f.id);g.value="/"+g.value}};c.TagButton.prototype.closeTag=function(h,d){var g=this,f=g.isOpen(d);if(f!==false){d.openTags.splice(f,1)}h.value=g.display};c.TagButton.prototype.isOpen=function(d){var g=this,f=0,e=false;if(d.openTags){while(e===false&&f<d.openTags.length){e=d.openTags[f]==g.id?f:false;f++}}else{e=false}return e};c.TagButton.prototype.callback=function(o,h,p){var u=this,q,e,m,g,s=h.value,j,d,n,f,k=s?u.tagEnd:"";if(document.sele
ction){h.focus();f=document.selection.createRange();if(f.text.length>0){if(!u.tagEnd){f.text=f.text+u.tagStart}else{f.text=u.tagStart+f.text+k}}else{if(!u.tagEnd){f.text=u.tagStart}else{if(u.isOpen(p)===false){f.text=u.tagStart;u.openTag(o,p)}else{f.text=k;u.closeTag(o,p)}}}h.focus()}else{if(h.selectionStart||h.selectionStart=="0"){q=h.selectionStart;e=h.selectionEnd;m=e;g=h.scrollTop;j=s.substring(0,q);d=s.substring(e,s.length);n=s.substring(q,e);if(q!=e){if(!u.tagEnd){h.value=j+n+u.tagStart+d;m+=u.tagStart.length}else{h.value=j+u.tagStart+n+k+d;m+=u.tagStart.length+k.length}}else{if(!u.tagEnd){h.value=j+u.tagStart+d;m=q+u.tagStart.length}else{if(u.isOpen(p)===false){h.value=j+u.tagStart+d;u.openTag(o,p);m=q+u.tagStart.length}else{h.value=j+k+d;m=q+k.length;u.closeTag(o,p)}}}h.focus();h.selectionStart=m;h.selectionEnd=m;h.scrollTop=g}else{if(!k){h.value+=u.tagStart}else{if(u.isOpen(p)!==false){h.value+=u.tagStart;u.openTag(o,p)}else{h.value+=k;u.closeTag(o,p)}}
h.focus()}}};c.SpellButton=function(){c.Button.call(this,"spell",quicktagsL10n.lookup,"",quicktagsL10n.dictionaryLookup)};c.SpellButton.prototype=new c.Button();c.SpellButton.prototype.callback=function(h,g,d){var j="",i,f,e;if(document.selection){g.focus();i=document.selection.createRange();if(i.text.length>0){j=i.text}}else{if(g.selectionStart||g.selectionStart=="0"){f=g.selectionStart;e=g.selectionEnd;if(f!=e){j=g.value.substring(f,e)}}}if(j===""){j=prompt(quicktagsL10n.wordLookup,"")}if(j!==null&&/^\w[\w ]*$/.test(j)){window.open("http://www.answers.com/"+encodeURIComponent(j))}};c.CloseButton=function(){c.Button.call(this,"close",quicktagsL10n.closeTags,"",quicktagsL10n.closeAllOpenTags)};c.CloseButton.prototype=new c.Button();c._close=function(i,j,d){var g,f,h=d.openTags;if(h){while(h.length>0){g=d.getButton(h[h.length-1]);f=document.getElementById(d.name+"_&quo
t;+g.id);g.callback.call(g,f,j,d)}}};c.CloseButton.prototype.callback=c._close;c.closeAllTags=function(e){var d=this.getInstance(e);c._close("",d.canvas,d)};c.LinkButton=function(){c.TagButton.call(this,"link","link","","</a>","a")};c.LinkButton.prototype=new c.TagButton();c.LinkButton.prototype.callback=function(i,j,g,f){var d,h=this;if(typeof(wpLink)!="undefined"){wpLink.open();return}if(!f){f="http://"}if(h.isOpen(g)===false){d=prompt(quicktagsL10n.enterURL,f);if(d){h.tagStart='<a href="'+d+'">';c.TagButton.prototype.callback.call(h,i,j,g)}}else{c.TagButton.prototype.callback.call(h,i,j,g)}};c.ImgButton=function(){c.TagButton.call(this,"img","img","","","m")};c.ImgButton.prototype=new c.TagButton();c.ImgButton.prototype.callback=function(h,j,f,d){if(!d){d="http://"}var i=prompt(quicktagsL10n.enterImageURL,d),g;if
(i){g=prompt(quicktagsL10n.enterImageDescription,"");this.tagStart='<img src="'+i+'" alt="'+g+'" />';c.TagButton.prototype.callback.call(this,h,j,f)}};c.FullscreenButton=function(){c.Button.call(this,"fullscreen",quicktagsL10n.fullscreen,"f",quicktagsL10n.toggleFullscreen)};c.FullscreenButton.prototype=new c.Button();c.FullscreenButton.prototype.callback=function(d,f){if(f.id!="content"||typeof(fullscreen)=="undefined"){return}fullscreen.on()};edButtons[10]=new c.TagButton("strong","b","<strong>","</strong>","b");edButtons[20]=new c.TagButton("em","i","<em>","</em>","i"),edButtons[30]=new c.LinkButton(),edButtons[40]=new c.TagButton("block","b-quote","\n\n<blockquote>","</blockquote>\n\n","q"),edButtons[50]=new c.TagB
utton("del","del",'<del datetime="'+a+'">',"</del>","d"),edButtons[60]=new c.TagButton("ins","ins",'<ins datetime="'+a+'">',"</ins>","s"),edButtons[70]=new c.ImgButton(),edButtons[80]=new c.TagButton("ul","ul","<ul>\n","</ul>\n\n","u"),edButtons[90]=new c.TagButton("ol","ol","<ol>\n","</ol>\n\n","o"),edButtons[100]=new c.TagButton("li","li","\t<li>","</li>\n","l"),edButtons[110]=new c.TagButton("code","code","<code>","</code>","c"),edButtons[120]=new c.TagButton("more","more","<!--more-->","","t"),edButtons[130]=new c.SpellButton(),edButtons[140]=new c.Cl
oseButton()})();
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (19171 => 19172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-11-05 13:35:48 UTC (rev 19171)
+++ trunk/wp-includes/script-loader.php 2011-11-05 16:00:38 UTC (rev 19172)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1', 1 );
</span><span class="cx">
</span><del>- $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20110919', 1 );
</del><ins>+ $scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", false, '20111105', 1 );
</ins><span class="cx"> $scripts->add_script_data( 'quicktags', 'quicktagsL10n', array(
</span><span class="cx"> 'wordLookup' => __('Enter a word to look up:'),
</span><span class="cx"> 'dictionaryLookup' => esc_attr(__('Dictionary lookup')),
</span></span></pre>
</div>
</div>
</body>
</html>