<!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>[26900] trunk/src/wp-includes/js/tinymce/plugins: TinyMCE: 'wpdialogs' plugin, don't add the (external) UI dialogs element to the internal windows array, fix .close().</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26900">26900</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-01-04 01:27:59 +0000 (Sat, 04 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: 'wpdialogs' plugin, don't add the (external) UI dialogs element to the internal windows array, fix .close(). See <a href="http://core.trac.wordpress.org/ticket/24067">#24067</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswpdialogspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpeditimagepluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstinymcepluginswpdialogspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js (26899 => 26900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js 2014-01-03 02:33:00 UTC (rev 26899)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js 2014-01-04 01:27:59 UTC (rev 26900)
</span><span class="lines">@@ -8,22 +8,28 @@
</span><span class="cx"> * For examples see the default plugins: https://github.com/tinymce/tinymce/tree/master/js/tinymce/plugins
</span><span class="cx"> */
</span><span class="cx"> tinymce.WPWindowManager = tinymce.InlineWindowManager = function( editor ) {
</span><ins>+ if ( this.wp ) {
+ return this;
+ }
</ins><span class="cx">
</span><ins>+ this.wp = {};
</ins><span class="cx"> this.parent = editor.windowManager;
</span><span class="cx"> this.editor = editor;
</span><span class="cx">
</span><span class="cx"> tinymce.extend( this, this.parent );
</span><span class="cx">
</span><span class="cx"> this.open = function( args, params ) {
</span><del>- var self = this, $element;
</del><ins>+ var $element,
+ self = this,
+ wp = this.wp;
</ins><span class="cx">
</span><span class="cx"> if ( ! args.wpDialog ) {
</span><del>- return this.parent.open( args, params );
</del><ins>+ return this.parent.open.apply( this, arguments );
</ins><span class="cx"> } else if ( ! args.id ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- self.element = $element = jQuery( '#' + args.id );
</del><ins>+ wp.$element = $element = jQuery( '#' + args.id );
</ins><span class="cx">
</span><span class="cx"> if ( ! $element.length ) {
</span><span class="cx"> return;
</span><span class="lines">@@ -33,9 +39,8 @@
</span><span class="cx"> window.console.log('tinymce.WPWindowManager is deprecated. Use the default editor.windowManager to open dialogs with inline HTML.');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- self.features = args;
- self.params = params;
- self.windows.push( $element );
</del><ins>+ wp.features = args;
+ wp.params = params;
</ins><span class="cx">
</span><span class="cx"> // Store selection. Takes a snapshot in the FocusManager of the selection before focus is moved to the dialog.
</span><span class="cx"> editor.nodeChanged();
</span><span class="lines">@@ -55,24 +60,20 @@
</span><span class="cx"> $element.wpdialog('open');
</span><span class="cx">
</span><span class="cx"> $element.on( 'wpdialogclose', function() {
</span><del>- var i = self.windows.length;
-
- while ( i-- && i > -1 ) {
- if ( self.windows[i] === self.element ) {
- self.windows.splice( i, 1 );
- }
</del><ins>+ if ( self.wp.$element ) {
+ self.wp = {};
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> this.close = function() {
</span><del>- if ( ! this.features.wpDialog ) {
</del><ins>+ if ( ! this.wp.features || ! this.wp.features.wpDialog ) {
</ins><span class="cx"> return this.parent.close.apply( this, arguments );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this.element.wpdialog('close');
</del><ins>+ this.wp.$element.wpdialog('close');
</ins><span class="cx"> };
</span><del>-}
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> tinymce.PluginManager.add( 'wpdialogs', function( editor ) {
</span><span class="cx"> // Replace window manager
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpeditimagepluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (26899 => 26900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-01-03 02:33:00 UTC (rev 26899)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js 2014-01-04 01:27:59 UTC (rev 26900)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> out = b.match( /<dd [^>]+>([\s\S]+?)<\/dd>/i );
</span><span class="cx">
</span><span class="cx"> if ( out && out[1] ) {
</span><del>- return '<p>' + out[1] + '</p>'
</del><ins>+ return '<p>' + out[1] + '</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return '';
</span></span></pre>
</div>
</div>
</body>
</html>