Ticket #22541: 22541-4.patch

wp-admin/js/wp-fullscreen.js

@@ -482 +482 @@
         }
 
         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);
         }
 
         api.refresh_buttons = function( fade ) {

wp-includes/css/editor.css

@@ -1148 +1148 @@
         padding: 2px;
         position: absolute;
         display: none;
-        z-index: 999998;
+        z-index: 100000;
 }
 
 #wp_editimgbtn,

wp-includes/css/media-views.css

@@ -68 +68 @@
         left: 40px;
         right: 40px;
         bottom: 40px;
-        z-index: 125000;
+        z-index: 160000;
 }
 
 .media-modal-backdrop {
@@ -79 +79 @@
         bottom: 0;
         background: #000;
         opacity: 0.8;
-        z-index: 120000;
+        z-index: 159900;
 }
 
 .media-modal-backdrop div {

wp-includes/js/media-editor.js

@@ -471 +471 @@
                 },
 
                 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();
 
@@ -485 +484 @@
                                 // See: http://core.trac.wordpress.org/ticket/22445
                                 $this.blur();
 
-                                if ( ! _.isString( editor ) )
-                                        return;
+                                wp.media.editor.open( editor );
+                        });
+                },
 
-                                workflow = wp.media.editor.get( editor );
+                open: function( id ) {
+                        var workflow;
 
-                                // If the workflow exists, just open it.
-                                if ( workflow ) {
-                                        workflow.open();
-                                        return;
-                                }
+                        // If an empty `id` is provided, default to `wpActiveEditor`.
+                        id = id || wpActiveEditor;
 
-                                // Initialize the editor's workflow if we haven't yet.
-                                wp.media.editor.add( editor );
-                        });
+                        // 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;
                 }
         };
 
         $( wp.media.editor.init );
-}(jQuery));
- No newline at end of file
+}(jQuery));

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

@@ -63 +63 @@
                         });
 
                         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 );
                         });
 
                         // Register buttons