Changeset 27625

Timestamp:

03/19/2014 09:15:50 PM (11 years ago)

Author:

nacin

Message:

Only enqueue the image editor in the media modal in the admin.

props gcorne.
see #21811.

Location:

trunk/src/wp-includes

Files:

• js/media-views.js (modified) (2 diffs)
• media-template.php (modified) (1 diff)
• media.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

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

@@ -5595 +5595 @@
         editAttachment: function( event ) {
             var editState = this.controller.state( 'edit-image' );
-            event.preventDefault();
-
-            editState.set( 'image', this.model );
-            this.controller.setState( 'edit-image' );
+            if ( window.imageEdit ) {
+                event.preventDefault();
+
+                editState.set( 'image', this.model );
+                this.controller.setState( 'edit-image' );
+            } else {
+                this.$el.addClass('needs-refresh');
+            }
         },
         /**
@@ -5945 +5949 @@
         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' );
+            }
         }
     });

trunk/src/wp-includes/media-template.php

@@ -667 +667 @@
                     <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' ); ?>" />
                 <# } #>

trunk/src/wp-includes/media.php

@@ -2537 +2537 @@
     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();

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

@@ -395 +395 @@
     // 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 );