<!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>[22208] trunk/wp-includes/js: MCE Views: Add selection/deselection when a view is clicked.</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/22208">22208</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-10-11 23:52:09 +0000 (Thu, 11 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>MCE Views: Add selection/deselection when a view is clicked.
These methods should be expanded to prevent content from being inserted into the view by blocking and rerouting keystrokes as appropriate as well as repositioning the caret before content is inserted.
see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>, <a href="http://core.trac.wordpress.org/ticket/21812">#21812</a>, <a href="http://core.trac.wordpress.org/ticket/21813">#21813</a>, <a href="http://core.trac.wordpress.org/ticket/21815">#21815</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmceviewjs">trunk/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpvieweditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wpview/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesjstinymcethemesadvancedskinswp_themecontentcss">trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/mce-view.js (22207 => 22208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/mce-view.js 2012-10-11 23:40:23 UTC (rev 22207)
+++ trunk/wp-includes/js/mce-view.js 2012-10-11 23:52:09 UTC (rev 22208)
</span><span class="lines">@@ -359,6 +359,36 @@
</span><span class="cx"> return wp.mce.view.removeInternalAttrs( wp.html.attrs( content ) );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ // ### Select a view.
+ //
+ // Accepts a MCE view wrapper `node` (i.e. a node with the
+ // `wp-view-wrap` class).
+ select: function( node ) {
+ var $node = $(node);
+
+ // Bail if node is already selected.
+ if ( $node.hasClass('selected') )
+ return;
+
+ $node.addClass('selected');
+ $( node.firstChild ).trigger('select');
+ },
+
+ // ### Deselect a view.
+ //
+ // Accepts a MCE view wrapper `node` (i.e. a node with the
+ // `wp-view-wrap` class).
+ deselect: function( node ) {
+ var $node = $(node);
+
+ // Bail if node is already selected.
+ if ( ! $node.hasClass('selected') )
+ return;
+
+ $node.removeClass('selected');
+ $( node.firstChild ).trigger('deselect');
+ },
+
</ins><span class="cx"> // Link any localized strings.
</span><span class="cx"> l10n: _.isUndefined( _wpMceViewL10n ) ? {} : _wpMceViewL10n
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpvieweditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpview/editor_plugin_src.js (22207 => 22208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpview/editor_plugin_src.js 2012-10-11 23:40:23 UTC (rev 22207)
+++ trunk/wp-includes/js/tinymce/plugins/wpview/editor_plugin_src.js 2012-10-11 23:52:09 UTC (rev 22208)
</span><span class="lines">@@ -3,9 +3,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> (function() {
</span><ins>+
+
</ins><span class="cx"> tinymce.create('tinymce.plugins.wpView', {
</span><span class="cx"> init : function( editor, url ) {
</span><del>- var wpView = this;
</del><ins>+ var wpView = this,
+ selected;
</ins><span class="cx">
</span><span class="cx"> // Check if the `wp.mce` API exists.
</span><span class="cx"> if ( typeof wp === 'undefined' || ! wp.mce )
</span><span class="lines">@@ -61,8 +64,37 @@
</span><span class="cx">
</span><span class="cx"> o.content = wp.mce.view.toText( o.content );
</span><span class="cx"> });
</span><ins>+
+ // Triggers when the selection is changed.
+ editor.onNodeChange.add( function( editor, controlManager, node, collapsed, o ) {
+ var view = wpView.getParentView( node );
+
+ // If we've clicked off of the selected view, deselect it.
+ if ( selected && selected !== view )
+ wp.mce.view.deselect( selected );
+
+ // Bail if we're not selecting another view.
+ if ( ! view )
+ return;
+
+ // Update the selected view.
+ selected = view;
+ wp.mce.view.select( selected );
+
+ // Prevent the selection from propagating to other plugins.
+ return false;
+ });
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ getParentView : function( node ) {
+ while ( node ) {
+ if ( /(?:^|\s)wp-view-wrap(?:\s|$)/.test( node.className ) )
+ return node;
+
+ node = node.parentNode;
+ }
+ },
+
</ins><span class="cx"> getInfo : function() {
</span><span class="cx"> return {
</span><span class="cx"> longname : 'WordPress Views',
</span></span></pre></div>
<a id="trunkwpincludesjstinymcethemesadvancedskinswp_themecontentcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css (22207 => 22208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css 2012-10-11 23:40:23 UTC (rev 22207)
+++ trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css 2012-10-11 23:52:09 UTC (rev 22208)
</span><span class="lines">@@ -176,16 +176,20 @@
</span><span class="cx"> inset 0 -60px 30px -30px rgba( 0, 0, 0, 0.2 );*/
</span><span class="cx"> overflow: hidden;
</span><span class="cx">
</span><del>- -webkit-transition: opacity 100ms ease-in-out;
- -moz-transition: opacity 100ms ease-in-out;
- -ms-transition: opacity 100ms ease-in-out;
- -o-transition: opacity 100ms ease-in-out;
- transition: opacity 100ms ease-in-out;
</del><ins>+ -webkit-transition: opacity 100ms ease-in-out, background 150ms;
+ -moz-transition: opacity 100ms ease-in-out, background 150ms;
+ -ms-transition: opacity 100ms ease-in-out, background 150ms;
+ -o-transition: opacity 100ms ease-in-out, background 150ms;
+ transition: opacity 100ms ease-in-out, background 150ms;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-view-wrap:hover .overlay {
</del><ins>+.wp-view-wrap:hover .overlay,
+.wp-view-wrap.selected .overlay {
</ins><span class="cx"> opacity: 1;
</span><span class="cx"> }
</span><ins>+.wp-view-wrap.selected .overlay {
+ background: rgba( 0, 86, 132, 0.3 );
+}
</ins><span class="cx">
</span><span class="cx"> .wp-view-wrap .spinner {
</span><span class="cx"> background: #fff url("../../../../../../../wp-admin/images/wpspin_light.gif") no-repeat center center;
</span><span class="lines">@@ -226,11 +230,6 @@
</span><span class="cx"> color: #333;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.wp-view-wrap .close,
-.wp-view-wrap .edit {
- display: none;
-}
-
</del><span class="cx"> .wp-view-wrap .close {
</span><span class="cx"> top: 5px;
</span><span class="cx"> right: 5px;
</span><span class="lines">@@ -245,12 +244,6 @@
</span><span class="cx"> padding: 0 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.editor-attachment:hover .close,
-.editor-gallery:hover .close,
-.editor-gallery:hover .edit {
- display: block;
-}
-
</del><span class="cx"> .editor-attachment {
</span><span class="cx"> position: relative;
</span><span class="cx"> margin-top: 10px;
</span></span></pre>
</div>
</div>
</body>
</html>