Changeset 32999

Timestamp:

06/30/2015 03:57:42 AM (11 years ago)

Author:

azaozz

Message:

Press This:

• Add support for the Text editor.
• Add auto-scrolling when the caret moves out of the viewport while the user is typing (similarly to editor-expand).
• Add auto-resize for the textarea.

See #32706.

Location:

trunk/src/wp-admin

Files:

• css/press-this.css (modified) (1 diff)
• includes/class-wp-press-this.php (modified) (1 diff)
• js/press-this.js (modified) (10 diffs)

trunk/src/wp-admin/css/press-this.css

@@ -2173 +2173 @@
         margin-left: 11px;
 }
+
+/* Text editor */
+#pressthis {
+        color: #404040;
+        resize: none;
+        padding-top: 30px;
+}
+
+.wp-editor-wrap .quicktags-toolbar {
+        background: transparent;
+        border: none;
+}
+
+/* Switch editor buttons */
+.wp-editor-wrap .wp-editor-tools {
+        z-index: 0;
+}
+
+.wp-editor-wrap .wp-editor-tabs {
+        padding: 2px;
+}
+
+.wp-editor-wrap .wp-switch-editor {
+        top: 0;
+        margin: 3px 0 0 5px;
+        background: #f5f5f5;
+        color: #555;
+        border-color: #ccc;
+}
+
+.wp-editor-wrap .wp-switch-editor:hover {
+        background: #fafafa;
+        border-color: #999;
+        color: #23282d;
+}
+
+.wp-editor-wrap.tmce-active .switch-tmce,
+.wp-editor-wrap.html-active .switch-html {
+        background: #fff;
+        border-color: #d8d8d8;
+}

trunk/src/wp-admin/includes/class-wp-press-this.php

@@ -1388 +1388 @@
                                                 'toolbar2'              => 'undo,redo',
                                         ),
-                                        'quicktags' => false,
+                                        'quicktags' => array(
+                                                'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,more',
+                                        ),
                                 ) );
 

trunk/src/wp-admin/js/press-this.js

@@ -6 +6 @@
         var PressThis = function() {
                 var editor, $mediaList, $mediaThumbWrap,
+                        $window               = $( window ),
+                        $document             = $( document ),
                         saveAlert             = false,
                         textarea              = document.createElement( 'textarea' ),
@@ -18 +20 @@
                         offscreenHidden       = isOffScreen + ' ' + isHidden,
                         iOS                   = /iPad|iPod|iPhone/.test( window.navigator.userAgent ),
+                        $textEditor           = $( '#pressthis' ),
+                        textEditor            = $textEditor[0],
+                        textEditorMinHeight   = 600,
+                        textLength            = 0,
                         transitionEndEvent    = ( function() {
                                 var style = document.documentElement.style;
@@ -113 +119 @@
                         $( '.spinner' ).removeClass( 'is-active' );
                         $( '.post-actions button' ).removeAttr( 'disabled' );
+                }
+
+                function textEditorResize( reset ) {
+                        var pageYOffset, height;
+
+                        if ( editor && ! editor.isHidden() ) {
+                                return;
+                        }
+
+                        reset = ( reset === 'reset' ) || ( textLength && textLength > textEditor.value.length );
+                        height = textEditor.style.height;
+
+                        if ( reset ) {
+                                pageYOffset = window.pageYOffset;
+
+                                textEditor.style.height = 'auto';
+                                textEditor.style.height = Math.max( textEditor.scrollHeight, textEditorMinHeight ) + 'px';
+                                window.scrollTo( window.pageXOffset, pageYOffset );
+                        } else if ( parseInt( textEditor.style.height, 10 ) < textEditor.scrollHeight ) {
+                                textEditor.style.height = textEditor.scrollHeight + 'px';
+                        }
+
+                        textLength = textEditor.value.length;
+                }
+
+                function mceGetCursorOffset() {
+                        if ( ! editor ) {
+                                return false;
+                        }
+
+                        var node = editor.selection.getNode(),
+                                range, view, offset;
+
+                        if ( editor.wp && editor.wp.getView && ( view = editor.wp.getView( node ) ) ) {
+                                offset = view.getBoundingClientRect();
+                        } else {
+                                range = editor.selection.getRng();
+
+                                try {
+                                        offset = range.getClientRects()[0];
+                                } catch( er ) {}
+
+                                if ( ! offset ) {
+                                        offset = node.getBoundingClientRect();
+                                }
+                        }
+
+                        return offset.height ? offset : false;
+                }
+
+                // Make sure the caret is always visible.
+                function mceKeyup( event ) {
+                        var VK = window.tinymce.util.VK,
+                                key = event.keyCode;
+
+                        // Bail on special keys.
+                        if ( key <= 47 && ! ( key === VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE || key === VK.UP || key === VK.LEFT || key === VK.DOWN || key === VK.UP ) ) {
+                                return;
+                        // OS keys, function keys, num lock, scroll lock
+                        } else if ( ( key >= 91 && key <= 93 ) || ( key >= 112 && key <= 123 ) || key === 144 || key === 145 ) {
+                                return;
+                        }
+
+                        mceScroll( key );
+                }
+
+                function mceScroll( key ) {
+                        var cursorTop, cursorBottom, editorBottom,
+                                offset = mceGetCursorOffset(),
+                                bufferTop = 50,
+                                bufferBottom = 65,
+                                VK = window.tinymce.util.VK;
+
+                        if ( ! offset ) {
+                                return;
+                        }
+
+                        cursorTop = offset.top + editor.iframeElement.getBoundingClientRect().top;
+                        cursorBottom = cursorTop + offset.height;
+                        cursorTop = cursorTop - bufferTop;
+                        cursorBottom = cursorBottom + bufferBottom;
+                        editorBottom = $window.height();
+
+                        // Don't scroll if the node is taller than the visible part of the editor
+                        if ( editorBottom < offset.height ) {
+                                return;
+                        }
+
+                        if ( cursorTop < 0 && ( key === VK.UP || key === VK.LEFT || key === VK.BACKSPACE ) ) {
+                                window.scrollTo( window.pageXOffset, cursorTop + window.pageYOffset );
+                        } else if ( cursorBottom > editorBottom ) {
+                                window.scrollTo( window.pageXOffset, cursorBottom + window.pageYOffset - editorBottom );
+                        }
                 }
 
@@ -217 +316 @@
                         var src, link, newContent = '';
 
-                        if ( ! editor ) {
-                                return;
-                        }
-
                         src = checkUrl( $element.attr( 'data-wp-src' ) || '' );
                         link = checkUrl( data.u );
@@ -234 +329 @@
                         }
 
-                        if ( ! hasSetFocus ) {
-                                editor.setContent( '<p>' + newContent + '</p>' + editor.getContent() );
-                        } else {
-                                editor.execCommand( 'mceInsertContent', false, newContent );
+                        if ( editor && ! editor.isHidden() ) {
+                                if ( ! hasSetFocus ) {
+                                        editor.setContent( '<p>' + newContent + '</p>' + editor.getContent() );
+                                } else {
+                                        editor.execCommand( 'mceInsertContent', false, newContent );
+                                }
+                        } else if ( window.QTags ) {
+                                window.QTags.insertContent( newContent );
                         }
                 }
@@ -637 +736 @@
                         var $splitButton = $( '.split-button' );
 
-                        $( document ).on( 'tinymce-editor-init', function( event, ed ) {
+                        $document.on( 'tinymce-editor-init', function( event, ed ) {
                                 editor = ed;
 
@@ -647 +746 @@
                                         splitButtonClose();
                                 });
+
+                                editor.on( 'show', function() {
+                                        setTimeout( function() {
+                                                editor.execCommand( 'wpAutoResize' );
+                                        }, 300 );
+                                });
+
+                                editor.on( 'hide', function() {
+                                        setTimeout( function() {
+                                                textEditorResize( 'reset' );
+                                        }, 100 );
+                                });
+
+                                editor.on( 'keyup', mceKeyup );
+                                editor.on( 'undo redo', mceScroll );
+
                         }).on( 'click.press-this keypress.press-this', '.suggested-media-thumbnail', function( event ) {
                                 if ( event.type === 'click' || event.keyCode === 13 ) {
@@ -728 +843 @@
                         } );
 
-                        $( window ).on( 'beforeunload.press-this', function() {
+                        $window.on( 'beforeunload.press-this', function() {
                                 if ( saveAlert || ( editor && editor.isDirty() ) ) {
                                         return __( 'saveAlert' );
                                 }
-                        } );
+                        } ).on( 'resize.press-this', function() {
+                                if ( ! editor || editor.isHidden() ) {
+                                        textEditorResize( 'reset' );
+                                }
+                        });
 
                         $( 'button.add-cat-toggle' ).on( 'click.press-this', function() {
@@ -767 +886 @@
                         } );
 
+                        $textEditor.on( 'focus.press-this input.press-this propertychange.press-this', textEditorResize );
+
                         return true;
                 }
@@ -783 +904 @@
 
                 // Let's go!
-                $( document ).ready( function() {
+                $document.ready( function() {
                         render();
                         monitor();