Changeset 29603

Timestamp:

08/25/2014 07:36:12 PM (11 years ago)

Author:

azaozz

Message:

Media modal: when inserting content, prefer the editor id passed while opening the modal. wpActiveEditor can change in the background. (Includes some precommit prefixed selectors.) Fixes #28173

Location:

trunk/src

Files:

• wp-admin/css/common.css (modified) (1 diff)
• wp-admin/css/list-tables.css (modified) (1 diff)
• wp-includes/js/media-editor.js (modified) (4 diffs)

trunk/src/wp-admin/css/common.css

@@ -1004 +1004 @@
 
 .filter-links .current {
+    -webkit-box-shadow: none;
     box-shadow: none;
     border-bottom: 4px solid #666;

trunk/src/wp-admin/css/list-tables.css

@@ -1348 +1348 @@
     clear: right;
     width: 65%;
+    width: -webkit-calc( 100% - 180px );
     width: calc( 100% - 180px );
 }

trunk/src/wp-includes/js/media-editor.js

@@ -1 @@
-/* global getUserSetting, tinymce, QTags, wpActiveEditor */
+/* global getUserSetting, tinymce, QTags */
 
 // WordPress, TinyMCE, and Media
@@ -758 +758 @@
          */
         insert: function( html ) {
-            var editor,
+            var editor, wpActiveEditor,
                 hasTinymce = ! _.isUndefined( window.tinymce ),
-                hasQuicktags = ! _.isUndefined( window.QTags ),
+                hasQuicktags = ! _.isUndefined( window.QTags );
+
+            if ( this.activeEditor ) {
+                wpActiveEditor = window.wpActiveEditor = this.activeEditor;
+            } else {
                 wpActiveEditor = window.wpActiveEditor;
+            }
 
             // Delegate to the global `send_to_editor` if it exists.
@@ -922 +927 @@
 
             // If an empty `id` is provided, default to `wpActiveEditor`.
-            id = wpActiveEditor;
+            id = window.wpActiveEditor;
 
             // If that doesn't work, fall back to `tinymce.activeEditor.id`.
@@ -1054 +1059 @@
 
             id = this.id( id );
+            this.activeEditor = id;
 
             workflow = this.get( id );