Changeset 33426

Timestamp:

07/26/2015 10:10:31 AM (10 years ago)

Author:

iseulde

Message:

TinyMCE: views: use media setting to get post ID

Also fix dependency declarations and confusing variable names.

Props rhurling.
Fixes #33096.

Location:

trunk/src/wp-includes

Files:

• js/mce-view.js (modified) (14 diffs)
• script-loader.php (modified) (1 diff)

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

@@ -1 +1 @@
 /* global tinymce */
-
-window.wp = window.wp || {};
 
 /*
@@ -25 +23 @@
  * |  |- ...
  */
-( function( window, wp, $ ) {
+( function( window, wp, shortcode, $ ) {
     'use strict';
 
@@ -672 +670 @@
          */
         match: function( content ) {
-            var match = wp.shortcode.next( this.type, content );
+            var match = shortcode.next( this.type, content );
 
             if ( match ) {
@@ -721 +719 @@
         }
     } );
-} )( window, window.wp, window.jQuery );
+} )( window, window.wp, window.wp.shortcode, window.jQuery );
 
 /*
@@ -728 +726 @@
  * and a view for embeddable URLs.
  */
-( function( window, views, $ ) {
-    var postID = $( '#post_ID' ).val() || 0,
-        media, gallery, av, embed;
-
-    media = {
+( function( window, views, media ) {
+    var base, gallery, av, embed;
+
+    base = {
         state: [],
 
         edit: function( text, update ) {
             var type = this.type,
-                media = wp.media[ type ],
-                frame = media.edit( text );
+                frame = media[ type ].edit( text );
 
             this.pausePlayers && this.pausePlayers();
@@ -744 +740 @@
             _.each( this.state, function( state ) {
                 frame.state( state ).on( 'update', function( selection ) {
-                    update( media.shortcode( selection ).string(), type === 'gallery' );
+                    update( media[ type ].shortcode( selection ).string(), type === 'gallery' );
                 } );
             } );
@@ -756 +752 @@
     };
 
-    gallery = _.extend( {}, media, {
+    gallery = _.extend( {}, base, {
         state: [ 'gallery-edit' ],
-        template: wp.media.template( 'editor-gallery' ),
+        template: media.template( 'editor-gallery' ),
 
         initialize: function() {
-            var attachments = wp.media.gallery.attachments( this.shortcode, postID ),
+            var attachments = media.gallery.attachments( this.shortcode, media.view.settings.post.id ),
                 attrs = this.shortcode.attrs.named,
                 self = this;
@@ -783 +779 @@
                 self.render( self.template( {
                     attachments: attachments,
-                    columns: attrs.columns ? parseInt( attrs.columns, 10 ) : wp.media.galleryDefaults.columns
+                    columns: attrs.columns ? parseInt( attrs.columns, 10 ) : media.galleryDefaults.columns
                 } ) );
             } )
@@ -792 +788 @@
     } );
 
-    av = _.extend( {}, media, {
+    av = _.extend( {}, base, {
         action: 'parse-media-shortcode',
 
@@ -800 +796 @@
             if ( this.url ) {
                 this.loader = false;
-                this.shortcode = wp.media.embed.shortcode( {
+                this.shortcode = media.embed.shortcode( {
                     url: this.text
                 } );
@@ -806 +802 @@
 
             wp.ajax.post( this.action, {
-                post_ID: postID,
+                post_ID: media.view.settings.post.id,
                 type: this.shortcode.tag,
                 shortcode: this.shortcode.string()
@@ -847 +843 @@
 
         edit: function( text, update ) {
-            var media = wp.media.embed,
-                frame = media.edit( text, this.url ),
+            var frame = media.embed.edit( text, this.url ),
                 self = this;
 
@@ -865 +860 @@
                     update( data.url );
                 } else {
-                    update( media.shortcode( data ).string() );
+                    update( media.embed.shortcode( data ).string() );
                 }
             } );
@@ -909 +904 @@
         }
     } ) );
-} )( window, window.wp.mce.views, window.jQuery );
+} )( window, window.wp.mce.views, window.wp.media );

trunk/src/wp-includes/script-loader.php

@@ -457 +457 @@
     $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
     $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
-    $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 );
+    $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 );
 
     if ( is_admin() ) {