Changeset 31548

Timestamp:

02/26/2015 12:30:35 AM (10 years ago)

Author:

azaozz

Message:

TinyMCE: wpView improvements: remove the (obsolete) get/setViewText methods. Update stopping/pausing of multiple ME media players. Props iseulde. See #31412.

Location:

trunk/src/wp-includes/js

Files:

• mce-view.js (modified) (7 diffs)
• tinymce/plugins/wpview/plugin.js (modified) (4 diffs)

trunk/src/wp-includes/js/mce-view.js

@@ -652 +652 @@
                 frame = media.edit( text );
 
-            this.stopPlayers && this.stopPlayers();
+            this.pausePlayers && this.pausePlayers();
 
             _.each( this.state, function( state ) {
@@ -729 +729 @@
             } )
             .fail( function( response ) {
-                if ( self.type === 'embedURL' ) {
+                if ( self.url ) {
                     self.removeMarkers();
                 } else {
@@ -738 +738 @@
             this.getEditors( function( editor ) {
                 editor.on( 'wpview-selected', function() {
-                    self.stopPlayers();
+                    self.pausePlayers();
                 } );
             } );
         },
 
-        stopPlayers: function( remove ) {
+        pausePlayers: function() {
             this.getNodes( function( editor, node, content ) {
                 var win = $( 'iframe.wpview-sandbox', content ).get( 0 );
@@ -750 +750 @@
                     _.each( win.mejs.players, function( player ) {
                         try {
-                            player[ remove ? 'remove' : 'pause' ]();
+                            player.pause();
                         } catch ( e ) {}
                     } );
@@ -763 +763 @@
         edit: function( text, update ) {
             var media = wp.media.embed,
-                isURL = 'embedURL' === this.type,
-                frame = media.edit( text, isURL );
-
-            this.stopPlayers();
+                frame = media.edit( text, !! this.url ),
+                self = this;
+
+            this.pausePlayers();
 
             frame.state( 'embed' ).props.on( 'change:url', function( model, url ) {
@@ -775 +775 @@
 
             frame.state( 'embed' ).on( 'select', function() {
-                if ( isURL ) {
+                if ( self.url ) {
                     update( frame.state( 'embed' ).metadata.url );
                 } else {
@@ -809 +809 @@
         match: function( content ) {
             var re = /(^|<p>)(https?:\/\/[^\s"]+?)(<\/p>\s*|$)/gi,
-                match = re.exec( tinymce.trim( content ) );
+                match = re.exec( content );
 
             if ( match ) {

trunk/src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -35 +35 @@
     }
 
-    /**
-     * Get the text/shortcode string for a view.
-     *
-     * @param view The view wrapper's node
-     * @returns string The text/shoercode string of the view
-     */
-    function getViewText( view ) {
-        if ( view = getView( view ) ) {
-            return window.decodeURIComponent( editor.dom.getAttrib( view, 'data-wpview-text' ) || '' );
-        }
-
-        return '';
-    }
-
-    /**
-     * Set the view's original text/shortcode string
-     *
-     * @param view The view wrapper's HTML id or node
-     * @param text The text string to be set
-     */
-    function setViewText( view, text ) {
-        view = getView( view );
-
-        if ( view ) {
-            editor.dom.setAttrib( view, 'data-wpview-text', window.encodeURIComponent( text || '' ) );
-            return true;
-        }
-
-        return false;
-    }
-
     function _stop( event ) {
         event.stopPropagation();
@@ -139 +108 @@
             'class': 'wpview-clipboard',
             'contenteditable': 'true'
-        }, getViewText( viewNode ) );
+        }, decodeURIComponent( editor.dom.getAttrib( viewNode, 'data-wpview-text' ) ) );
 
         editor.dom.select( '.wpview-body', viewNode )[0].appendChild( clipboard );
@@ -198 +167 @@
     if ( typeof wp === 'undefined' || ! wp.mce ) {
         return {
-            getViewText: _noop,
-            setViewText: _noop,
             getView: _noop
         };
@@ -722 +689 @@
 
     return {
-        getViewText: getViewText,
-        setViewText: setViewText,
         getView: getView
     };