Changeset 22875

Timestamp:

11/27/2012 07:09:00 PM (12 years ago)

Author:

nacin

Message:

Media: Introduce wp.media.editor.open(editor_id) and leverage it in distraction-free writing (fullscreen). props azaozz, koopersmith. fixes #22541.

Location:

trunk

Files:

• wp-admin/js/wp-fullscreen.js (modified) (1 diff)
• wp-includes/css/editor.css (modified) (1 diff)
• wp-includes/css/media-views.css (modified) (2 diffs)
• wp-includes/js/media-editor.js (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js (modified) (1 diff)

trunk/wp-admin/js/wp-fullscreen.js

@@ -483 +483 @@
 
     api.medialib = function() {
-        if ( s.has_tinymce && 'tinymce' === s.mode ) {
-            tinyMCE.execCommand('WP_Medialib');
-        } else {
-            var href = $('#wp-' + s.editor_id + '-media-buttons a.thickbox').attr('href') || '';
-
-            if ( href )
-                tb_show('', href);
-        }
+        if ( typeof wp !== 'undefined' && wp.media && wp.media.editor )
+            wp.media.editor.open(s.editor_id);
     }
 

trunk/wp-includes/css/editor.css

@@ -1149 +1149 @@
     position: absolute;
     display: none;
-    z-index: 999998;
+    z-index: 100000;
 }
 

trunk/wp-includes/css/media-views.css

@@ -69 +69 @@
     right: 40px;
     bottom: 40px;
-    z-index: 125000;
+    z-index: 160000;
 }
 
@@ -80 +80 @@
     background: #000;
     opacity: 0.8;
-    z-index: 120000;
+    z-index: 159900;
 }
 

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

@@ -472 +472 @@
 
         init: function() {
-            $(document.body).on('click', '.insert-media', function( event ) {
+            $(document.body).on( 'click', '.insert-media', function( event ) {
                 var $this = $(this),
-                    editor = $this.data('editor'),
-                    workflow;
+                    editor = $this.data('editor');
 
                 event.preventDefault();
@@ -486 +485 @@
                 $this.blur();
 
-                if ( ! _.isString( editor ) )
-                    return;
-
-                workflow = wp.media.editor.get( editor );
-
-                // If the workflow exists, just open it.
-                if ( workflow ) {
-                    workflow.open();
-                    return;
-                }
-
-                // Initialize the editor's workflow if we haven't yet.
-                wp.media.editor.add( editor );
+                wp.media.editor.open( editor );
             });
+        },
+
+        open: function( id ) {
+            var workflow;
+
+            // If an empty `id` is provided, default to `wpActiveEditor`.
+            id = id || wpActiveEditor;
+
+            // If that doesn't work, fall back to `tinymce.activeEditor`.
+            if ( ! id && typeof tinymce !== 'undefined' && tinymce.activeEditor )
+                id = id || tinymce.activeEditor.id;
+
+            // Last but not least, fall back to the empty string.
+            id = id || '';
+
+            workflow = wp.media.editor.get( id );
+
+            // If the workflow exists, open it.
+            // Initialize the editor's workflow if we haven't yet.
+            if ( workflow )
+                workflow.open();
+            else
+                workflow = wp.media.editor.add( id );
+
+            return workflow;
         }
     };

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js

@@ -64 +64 @@
 
             ed.addCommand('WP_Medialib', function() {
-                var id = ed.getParam('wp_fullscreen_editor_id') || ed.getParam('fullscreen_editor_id') || ed.id,
-                    link = tinymce.DOM.select('#wp-' + id + '-media-buttons a.thickbox');
-
-                if ( link && link[0] )
-                    link = link[0];
-                else
-                    return;
-
-                tb_show('', link.href);
+                if ( typeof wp !== 'undefined' && wp.media && wp.media.editor )
+                    wp.media.editor.open( ed.id );
             });