Ticket #21811: 21811-10.patch

src/wp-includes/js/media-views.js

@@ -5594 +5594 @@
                  */
                 editAttachment: function( event ) {
                         var editState = this.controller.state( 'edit-image' );
-                        event.preventDefault();
+                        if ( window.imageEdit ) {
+                                event.preventDefault();
 
-                        editState.set( 'image', this.model );
-                        this.controller.setState( 'edit-image' );
+                                editState.set( 'image', this.model );
+                                this.controller.setState( 'edit-image' );
+                        } else {
+                                this.$el.addClass('needs-refresh');
+                        }
                 },
                 /**
                  * @param {Object} event
@@ -5944 +5948 @@
 
                 editAttachment: function( event ) {
                         var editState = this.controller.state( 'edit-image' );
-                        event.preventDefault();
 
-                        editState.set( 'image', this.model.attachment );
-                        this.controller.setState( 'edit-image' );
+                        if ( window.imageEdit ) {
+                                event.preventDefault();
+                                editState.set( 'image', this.model.attachment );
+                                this.controller.setState( 'edit-image' );
+                        }
                 }
         });
 

src/wp-includes/media-template.php

@@ -666 +666 @@
                                 <div class="thumbnail">
                                         <img src="{{ data.model.url }}" draggable="false" />
                                 </div>
-                                <# if ( data.attachment ) { #>
+                                <# if ( data.attachment && window.imageEdit ) { #>
                                         <input type="button" class="edit-attachment button" value="<?php esc_attr_e( 'Edit Image' ); ?>" />
                                 <# } #>
 

src/wp-includes/media.php

@@ -2536 +2536 @@
         wp_enqueue_script( 'media-editor' );
         wp_enqueue_script( 'media-audiovideo' );
         wp_enqueue_style( 'media-views' );
+        if ( is_admin() ) {
+                wp_enqueue_script( 'image-edit' );
+        }
         wp_enqueue_style( 'imgareaselect' );
         wp_plupload_default_settings();
 

src/wp-includes/script-loader.php

@@ -394 +394 @@
 
         // To enqueue media-views or media-editor, call wp_enqueue_media().
         // Both rely on numerous settings, styles, and templates to operate correctly.
-        $scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'image-edit' ), false, 1 );
+        $scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement' ), false, 1 );
         $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', 'mce-view' ), false, 1 );
         $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );