<!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>[40598] trunk/src/wp-includes/js/quicktags.js: Editor: Add `init` and `remove` methods to Quicktags.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/40598">40598</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/40598","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-10 02:46:24 +0000 (Wed, 10 May 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: Add `init` and `remove` methods to Quicktags.
Props helgatheviking azaozz.
Fixes <a href="https://core.trac.wordpress.org/ticket/26183">#26183</a> <a href="https://core.trac.wordpress.org/ticket/40708">#40708</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsquicktagsjs">trunk/src/wp-includes/js/quicktags.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsquicktagsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/quicktags.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/quicktags.js 2017-05-09 23:25:56 UTC (rev 40597)
+++ trunk/src/wp-includes/js/quicktags.js 2017-05-10 02:46:24 UTC (rev 40598)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( tb.addEventListener ) {
</span><span class="cx" style="display: block; padding: 0 10px"> tb.addEventListener( 'click', onclick, false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( wrap ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wrap.addEventListener( 'click', setActiveEditor, false );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,12 +243,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return document.getElementById(name + '_' + id);
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ t.init = function() {
+ _domReady( function(){ qt._buttonsInit( id ); } );
+ };
+
+ t.remove = function() {
+ delete qt.instances[id];
+
+ if ( tb && tb.parentNode ) {
+ tb.parentNode.removeChild( tb );
+ }
+ };
+
</ins><span class="cx" style="display: block; padding: 0 10px"> qt.instances[id] = t;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( ! qt.instances['0'] ) {
- qt.instances['0'] = qt.instances[id];
- _domReady( function(){ qt._buttonsInit(); } );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ t.init();
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function _escape( text ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,16 +271,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return qt.instances[id];
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- qt._buttonsInit = function() {
- 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,close,';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ qt._buttonsInit = function( id ) {
+ var t = this;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ( inst in t.instances ) {
- if ( '0' === inst ) {
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function _init( instanceId ) {
+ var canvas, name, settings, theButtons, html, ed, id, i, use,
+ defaults = ',strong,em,link,block,del,ins,img,ul,ol,li,code,more,close,';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ed = t.instances[inst];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ed = t.instances[instanceId];
</ins><span class="cx" style="display: block; padding: 0 10px"> canvas = ed.canvas;
</span><span class="cx" style="display: block; padding: 0 10px"> name = ed.name;
</span><span class="cx" style="display: block; padding: 0 10px"> settings = ed.settings;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( i in edButtons ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !edButtons[i] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! edButtons[i] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,11 +301,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !edButtons[i].instance || edButtons[i].instance === inst ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! edButtons[i].instance || edButtons[i].instance === instanceId ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> theButtons[id] = edButtons[i];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( edButtons[i].html ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- html += edButtons[i].html(name + '_');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ html += edButtons[i].html( name + '_' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,9 +315,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> html += theButtons.dfw.html( name + '_' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'rtl' === document.getElementsByTagName('html')[0].dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'rtl' === document.getElementsByTagName( 'html' )[0].dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> theButtons.textdirection = new qt.TextDirectionButton();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- html += theButtons.textdirection.html(name + '_');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ html += theButtons.textdirection.html( name + '_' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ed.toolbar.innerHTML = html;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,6 +327,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> jQuery( document ).triggerHandler( 'quicktags-init', [ ed ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( id ) {
+ _init( id );
+ } else {
+ for ( id in t.instances ) {
+ _init( id );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> t.buttonsInitDone = true;
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,9 +621,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> qt.CloseButton.prototype.callback = qt._close;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- qt.closeAllTags = function(editor_id) {
- var ed = this.getInstance(editor_id);
- qt._close('', ed.canvas, ed);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ qt.closeAllTags = function( editor_id ) {
+ var ed = this.getInstance( editor_id );
+
+ if ( ed ) {
+ qt._close( '', ed.canvas, ed );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // the link button
</span></span></pre>
</div>
</div>
</body>
</html>