<!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>[29302] trunk/src: TinyMCE:</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/29302">29302</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-07-26 00:07:55 +0000 (Sat, 26 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE:
- Fix complex character input in Japanese, Chinese, etc. Was broken in getCursorOffset() in editor-expand.js.
- Disable auto-scrolling in some edge cases when editor expanding is enabled.
See <a href="http://core.trac.wordpress.org/ticket/28328">#28328</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjseditorexpandjs">trunk/src/wp-admin/js/editor-expand.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpviewpluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjseditorexpandjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/editor-expand.js (29301 => 29302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/editor-expand.js 2014-07-25 15:56:57 UTC (rev 29301)
+++ trunk/src/wp-admin/js/editor-expand.js 2014-07-26 00:07:55 UTC (rev 29302)
</span><span class="lines">@@ -124,14 +124,19 @@
</span><span class="cx"> $visualEditor = $contentWrap.find( '.mce-edit-area' );
</span><span class="cx"> $statusBar = $contentWrap.find( '.mce-statusbar' ).filter( ':visible' );
</span><span class="cx">
</span><del>- // Adjust when switching editor modes.
- editor.on( 'show', function() {
- setTimeout( function() {
- editor.execCommand( 'wpAutoResize' );
- adjust();
- }, 300 );
- } );
</del><ins>+ function getCursorOffset() {
+ var node = editor.selection.getNode(),
+ view, offset;
</ins><span class="cx">
</span><ins>+ if ( editor.plugins.wpview && ( view = editor.plugins.wpview.getView( node ) ) ) {
+ offset = view.getBoundingClientRect();
+ } else {
+ offset = node.getBoundingClientRect();
+ }
+
+ return offset.height ? offset : false;
+ }
+
</ins><span class="cx"> // Make sure the cursor is always visible.
</span><span class="cx"> // This is not only necessary to keep the cursor between the toolbars,
</span><span class="cx"> // but also to scroll the window when the cursor moves out of the viewport to a wpview.
</span><span class="lines">@@ -150,13 +155,18 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- cursorTop = offset.top + editor.getContentAreaContainer().getElementsByTagName( 'iframe' )[0].getBoundingClientRect().top;
</del><ins>+ cursorTop = offset.top + editor.getContentAreaContainer().firstChild.getBoundingClientRect().top;
</ins><span class="cx"> cursorBottom = cursorTop + offset.height;
</span><span class="cx"> cursorTop = cursorTop - buffer;
</span><span class="cx"> cursorBottom = cursorBottom + buffer;
</span><span class="cx"> editorTop = $adminBar.outerHeight() + $tools.outerHeight() + $visualTop.outerHeight();
</span><span class="cx"> editorBottom = windowHeight - $bottom.outerHeight();
</span><span class="cx">
</span><ins>+ // Don't scroll if the node is taller than the visible part of the editor
+ if ( editorBottom - editorTop < offset.height ) {
+ return;
+ }
+
</ins><span class="cx"> if ( cursorTop < editorTop && ( key === VK.UP || key === VK.LEFT || key === VK.BACKSPACE ) ) {
</span><span class="cx"> window.scrollTo( window.pageXOffset, cursorTop + window.pageYOffset - editorTop );
</span><span class="cx"> } else if ( cursorBottom > editorBottom ) {
</span><span class="lines">@@ -164,45 +174,14 @@
</span><span class="cx"> }
</span><span class="cx"> } );
</span><span class="cx">
</span><del>- function getCursorOffset() {
- var selection = editor.selection,
- node = selection.getNode(),
- range = selection.getRng(),
- view, clone, offset;
</del><ins>+ // Adjust when switching editor modes.
+ editor.on( 'show', function() {
+ setTimeout( function() {
+ editor.execCommand( 'wpAutoResize' );
+ adjust();
+ }, 300 );
+ } );
</ins><span class="cx">
</span><del>- if ( tinymce.Env.ie && tinymce.Env.ie < 9 ) {
- return;
- }
-
- if ( editor.plugins.wpview && ( view = editor.plugins.wpview.getView( node ) ) ) {
- offset = view.getBoundingClientRect();
- } else if ( selection.isCollapsed() ) {
- clone = range.cloneRange();
-
- if ( clone.startContainer.length > 1 ) {
- if ( clone.startContainer.length > clone.endOffset ) {
- clone.setEnd( clone.startContainer, clone.endOffset + 1 );
- } else {
- clone.setStart( clone.startContainer, clone.endOffset - 1 );
- }
-
- selection.setRng( clone );
- offset = selection.getRng().getBoundingClientRect();
- selection.setRng( range );
- } else {
- offset = node.getBoundingClientRect();
- }
- } else {
- offset = range.getBoundingClientRect();
- }
-
- if ( ! offset.height ) {
- return;
- }
-
- return offset;
- }
-
</del><span class="cx"> editor.on( 'hide', function() {
</span><span class="cx"> textEditorResize();
</span><span class="cx"> adjust();
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpviewpluginjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js (29301 => 29302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-07-25 15:56:57 UTC (rev 29301)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js 2014-07-26 00:07:55 UTC (rev 29302)
</span><span class="lines">@@ -286,8 +286,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> editor.dom.bind( editor.getBody().parentNode, 'mousedown mouseup click', function( event ) {
</span><del>- var view = getView( event.target ),
- deselectEventType;
</del><ins>+ var view = getView( event.target );
</ins><span class="cx">
</span><span class="cx"> firstFocus = false;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>