<!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>[26899] trunk/src/wp-includes: TinyMCE: back-compat, refresh and re-enable the 'wpdialogs' plugin, and mark it as deprecated.</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/26899">26899</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-01-03 02:33:00 +0000 (Fri, 03 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>TinyMCE: back-compat, refresh and re-enable the 'wpdialogs' plugin, and mark it as deprecated. See <a href="http://core.trac.wordpress.org/ticket/24067">#24067</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpdialogspluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp-editor.php (26898 => 26899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp-editor.php        2014-01-02 22:49:00 UTC (rev 26898)
+++ trunk/src/wp-includes/class-wp-editor.php   2014-01-03 02:33:00 UTC (rev 26899)
</span><span class="lines">@@ -234,6 +234,7 @@
</span><span class="cx">                                          'wpeditimage',
</span><span class="cx">                                          'wpgallery',
</span><span class="cx">                                          'wplink',
</span><ins>+                                               'wpdialogs',
</ins><span class="cx">                                   ) ) );
</span><span class="cx"> 
</span><span class="cx">                                  if ( ! empty( $mce_external_plugins ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpdialogspluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js (26898 => 26899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js     2014-01-02 22:49:00 UTC (rev 26898)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js        2014-01-03 02:33:00 UTC (rev 26899)
</span><span class="lines">@@ -1,36 +1,48 @@
</span><span class="cx"> /* global tinymce */
</span><ins>+/**
+ * Included for back-compat.
+ * The default WindowManager in TinyMCE 4.0 supports three types of dialogs:
+ *     - With HTML created from JS.
+ *     - With inline HTML (like WPWindowManager).
+ *     - Old type iframe based dialogs.
+ * For examples see the default plugins: https://github.com/tinymce/tinymce/tree/master/js/tinymce/plugins
+ */
+tinymce.WPWindowManager = tinymce.InlineWindowManager = function( editor ) {
</ins><span class="cx"> 
</span><del>-tinymce.WPWindowManager = function( editor ) {
-       var element;
-
</del><span class="cx">   this.parent = editor.windowManager;
</span><span class="cx">  this.editor = editor;
</span><span class="cx"> 
</span><del>-       tinymce.extend( this, this.parent )
</del><ins>+        tinymce.extend( this, this.parent );
</ins><span class="cx"> 
</span><span class="cx">  this.open = function( args, params ) {
</span><del>-               var self = this, element;
</del><ins>+                var self = this, $element;
</ins><span class="cx"> 
</span><del>-               if ( ! args.wpDialog )
</del><ins>+                if ( ! args.wpDialog ) {
</ins><span class="cx">                   return this.parent.open( args, params );
</span><del>-               else if ( ! args.id )
</del><ins>+                } else if ( ! args.id ) {
</ins><span class="cx">                   return;
</span><ins>+               }
</ins><span class="cx"> 
</span><del>-               self.element = element = jQuery('#' + args.id);
-               if ( ! element.length )
</del><ins>+                self.element = $element = jQuery( '#' + args.id );
+
+               if ( ! $element.length ) {
</ins><span class="cx">                   return;
</span><ins>+               }
</ins><span class="cx"> 
</span><ins>+               if ( window && window.console ) {
+                       window.console.log('tinymce.WPWindowManager is deprecated. Use the default editor.windowManager to open dialogs with inline HTML.');
+               }
+
</ins><span class="cx">           self.features = args;
</span><span class="cx">          self.params = params;
</span><del>-               self.onOpen.dispatch( self, args, params );
-               self.windows.push( element );
</del><ins>+                self.windows.push( $element );
</ins><span class="cx"> 
</span><del>-               // Store selection
-       //      self.bookmark = self.editor.selection.getBookmark(1);
</del><ins>+                // Store selection. Takes a snapshot in the FocusManager of the selection before focus is moved to the dialog.
+               editor.nodeChanged();
</ins><span class="cx"> 
</span><span class="cx">          // Create the dialog if necessary
</span><del>-               if ( ! element.data('wpdialog') ) {
-                       element.wpdialog({
</del><ins>+                if ( ! $element.data('wpdialog') ) {
+                       $element.wpdialog({
</ins><span class="cx">                           title: args.title,
</span><span class="cx">                          width: args.width,
</span><span class="cx">                          height: args.height,
</span><span class="lines">@@ -40,12 +52,23 @@
</span><span class="cx">                  });
</span><span class="cx">          }
</span><span class="cx"> 
</span><del>-               element.wpdialog('open');
</del><ins>+                $element.wpdialog('open');
+
+               $element.on( 'wpdialogclose', function() {
+                       var i = self.windows.length;
+
+                       while ( i-- && i > -1 ) {
+                               if ( self.windows[i] === self.element ) {
+                                       self.windows.splice( i, 1 );
+                               }
+                       }
+               });
</ins><span class="cx">   };
</span><span class="cx"> 
</span><span class="cx">  this.close = function() {
</span><del>-               if ( ! this.features.wpDialog )
</del><ins>+                if ( ! this.features.wpDialog ) {
</ins><span class="cx">                   return this.parent.close.apply( this, arguments );
</span><ins>+               }
</ins><span class="cx"> 
</span><span class="cx">          this.element.wpdialog('close');
</span><span class="cx">  };
</span></span></pre>
</div>
</div>

</body>
</html>