Changeset 27445

Timestamp:

03/06/2014 10:54:32 PM (11 years ago)

Author:

helen

Message:

At long last, a first pass at bringing the image editor into the media modal. props gcorne, DH-Shredder, tomauger. see #21811.

Location:

trunk/src

Files:

• wp-admin/js/image-edit.js (modified) (6 diffs)
• wp-includes/css/media-views.css (modified) (2 diffs)
• wp-includes/js/media-editor.js (modified) (2 diffs)
• wp-includes/js/media-models.js (modified) (1 diff)
• wp-includes/js/media-views.js (modified) (17 diffs)
• wp-includes/media-template.php (modified) (2 diffs)
• wp-includes/media.php (modified) (5 diffs)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/src/wp-admin/js/image-edit.js

@@ -6 +6 @@
     hold : {},
     postid : '',
+    _view : false,
 
     intval : function(f) {
@@ -242 +243 @@
             $('#image-editor-' + postid).empty().append(r);
             t.toggleEditor(postid, 0);
+            // refresh the attachment model so that changes propagate
+            if ( this._view ) {
+                this._view.refresh();
+            }
         });
     },
 
     save : function(postid, nonce) {
-        var data, target = this.getTarget(postid), history = this.filterHistory(postid, 0);
+        var data,
+            target = this.getTarget(postid),
+            history = this.filterHistory(postid, 0),
+            self = this;
 
         if ( '' === history ) {
@@ -284 +292 @@
             }
 
-            imageEdit.close(postid);
-        });
-    },
-
-    open : function(postid, nonce) {
+            if ( self._view ) {
+                self._view.save();
+            } else {
+                imageEdit.close(postid);
+            }
+        });
+    },
+
+    open : function( postid, nonce, view ) {
+        this._view = view;
+
         var data, elem = $('#image-editor-' + postid), head = $('#media-head-' + postid),
             btn = $('#imgedit-open-btn-' + postid), spin = btn.siblings('.spinner');
@@ -320 +334 @@
 
     initCrop : function(postid, image, parent) {
-        var t = this, selW = $('#imgedit-sel-width-' + postid),
-            selH = $('#imgedit-sel-height-' + postid);
+        var t = this,
+            selW = $('#imgedit-sel-width-' + postid),
+            selH = $('#imgedit-sel-height-' + postid),
+            $img;
 
         t.iasapi = $(image).imgAreaSelect({
@@ -331 +347 @@
             minHeight: 3,
 
-            onInit: function() {
+            onInit: function( img ) {
+                // Ensure that the imgareaselect wrapper elements are position:absolute
+                // (even if we're in a position:fixed modal)
+                $img = $( img );
+                $img.next().css( 'position', 'absolute' )
+                    .nextAll( '.imgareaselect-outer' ).css( 'position', 'absolute' );
+
                 parent.children().mousedown(function(e){
                     var ratio = false, sel, defRatio;
@@ -398 +420 @@
         this.iasapi = {};
         this.hold = {};
-        $('#image-editor-' + postid).fadeOut('fast', function() {
-            $('#media-head-' + postid).fadeIn('fast');
-            $(this).empty();
-        });
+
+        // If we've loaded the editor in the context of a Media Modal, then switch to the previous view,
+        // whatever that might have been.
+        if ( this._view ){
+            this._view.back();
+        }
+
+        // In case we are not accessing the image editor in the context of a View, close the editor the old-skool way
+        else {
+            $('#image-editor-' + postid).fadeOut('fast', function() {
+                $('#media-head-' + postid).fadeIn('fast');
+                $(this).empty();
+            });
+        }
+
+
     },
 

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

@@ -1433 +1433 @@
 
 /**
+ * Image Editor
+ */
+
+.media-frame .image-editor {
+    padding: 16px;
+}
+
+.media-frame .imgedit-wrap table td {
+    vertical-align: top;
+    padding-top: 0;
+}
+
+.media-frame .imgedit-wrap table td.imgedit-settings {
+    width: 250px;
+}
+/**
  * Embed from URL and Image Details
  */
@@ -1489 +1505 @@
     max-height: 200px;
     display: block;
+}
+
+.media-embed .edit-attachment {
+    margin-left: 10px;
 }
 

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

@@ -699 +699 @@
             this._frame = wp.media({
                 state: 'featured-image',
-                states: [ new wp.media.controller.FeaturedImage() ]
+                states: [ new wp.media.controller.FeaturedImage() , new wp.media.controller.EditImage() ]
             });
 
@@ -709 +709 @@
                     text: wp.media.view.l10n.setFeaturedImage
                 });
+            }, this._frame );
+
+            this._frame.on( 'content:render:edit-image', function() {
+                var selection = this.state('featured-image').get('selection'),
+                    view = new wp.media.view.EditImage( { model: selection.single(), controller: this } ).render();
+
+                this.content.set( view );
+
+                // after bringing in the frame, load the actual editor via an ajax call
+                view.loadEditor();
+
             }, this._frame );
 

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

@@ -372 +372 @@
         bindAttachmentListeners: function() {
             this.listenTo( this.attachment, 'sync', this.setLinkTypeFromUrl );
+            this.listenTo( this.attachment, 'change', this.updateSize );
         },
 

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

@@ -484 +484 @@
     });
 
+    media.selectionSync = {
+        syncSelection: function() {
+            var selection = this.get('selection'),
+                manager = this.frame._selection;
+
+            if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+                return;
+            }
+
+            // If the selection supports multiple items, validate the stored
+            // attachments based on the new selection's conditions. Record
+            // the attachments that are not included; we'll maintain a
+            // reference to those. Other attachments are considered in flux.
+            if ( selection.multiple ) {
+                selection.reset( [], { silent: true });
+                selection.validateAll( manager.attachments );
+                manager.difference = _.difference( manager.attachments.models, selection.models );
+            }
+
+            // Sync the selection's single item with the master.
+            selection.single( manager.single );
+        },
+
+        /**
+         * Record the currently active attachments, which is a combination
+         * of the selection's attachments and the set of selected
+         * attachments that this specific selection considered invalid.
+         * Reset the difference and record the single attachment.
+         */
+        recordSelection: function() {
+            var selection = this.get('selection'),
+                manager = this.frame._selection;
+
+            if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+                return;
+            }
+
+            if ( selection.multiple ) {
+                manager.attachments.reset( selection.toArray().concat( manager.difference ) );
+                manager.difference = [];
+            } else {
+                manager.attachments.add( selection.toArray() );
+            }
+
+            manager.single = selection._single;
+        }
+    };
+
     /**
      * wp.media.controller.Library
@@ -636 +684 @@
         },
 
-        syncSelection: function() {
-            var selection = this.get('selection'),
-                manager = this.frame._selection;
-
-            if ( ! this.get('syncSelection') || ! manager || ! selection ) {
-                return;
-            }
-
-            // If the selection supports multiple items, validate the stored
-            // attachments based on the new selection's conditions. Record
-            // the attachments that are not included; we'll maintain a
-            // reference to those. Other attachments are considered in flux.
-            if ( selection.multiple ) {
-                selection.reset( [], { silent: true });
-                selection.validateAll( manager.attachments );
-                manager.difference = _.difference( manager.attachments.models, selection.models );
-            }
-
-            // Sync the selection's single item with the master.
-            selection.single( manager.single );
-        },
-
-        /**
-         * Record the currently active attachments, which is a combination
-         * of the selection's attachments and the set of selected
-         * attachments that this specific selection considered invalid.
-         * Reset the difference and record the single attachment.
-         */
-        recordSelection: function() {
-            var selection = this.get('selection'),
-                manager = this.frame._selection;
-
-            if ( ! this.get('syncSelection') || ! manager || ! selection ) {
-                return;
-            }
-
-            if ( selection.multiple ) {
-                manager.attachments.reset( selection.toArray().concat( manager.difference ) );
-                manager.difference = [];
-            } else {
-                manager.attachments.add( selection.toArray() );
-            }
-
-            manager.single = selection._single;
-        },
 
         /**
@@ -734 +737 @@
         }
     });
+
+    _.extend( media.controller.Library.prototype, media.selectionSync );
 
     /**
@@ -990 +995 @@
             title:      l10n.setFeaturedImageTitle,
             priority:   60,
-            syncSelection: false
+            syncSelection: true
         }, media.controller.Library.prototype.defaults ),
 
@@ -1071 +1076 @@
             title:      l10n.replaceImageTitle,
             priority:   60,
-            syncSelection: false
+            syncSelection: true
         }, media.controller.Library.prototype.defaults ),
 
@@ -1120 +1125 @@
         }
     });
+
+    /**
+     * wp.media.controller.EditImage
+     *
+     * @constructor
+     * @augments wp.media.controller.State
+     * @augments Backbone.Model
+     */
+    media.controller.EditImage = media.controller.State.extend({
+        defaults: {
+            id: 'edit-image',
+            url: '',
+            menu: false,
+            toolbar: 'edit-image',
+            title: l10n.editImage,
+            content: 'edit-image',
+            syncSelection: true
+        },
+
+        activate: function() {
+            if ( ! this.get('selection') ) {
+                this.set( 'selection', new media.model.Selection() );
+            }
+            this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
+            this.syncSelection();
+        },
+
+        deactivate: function() {
+            this.stopListening( this.frame );
+        },
+
+        toolbar: function() {
+            var frame = this.frame,
+                lastState = frame.lastState(),
+                previous = lastState && lastState.id;
+
+            frame.toolbar.set( new media.view.Toolbar({
+                controller: frame,
+                items: {
+                    back: {
+                        style: 'primary',
+                        text:     l10n.back,
+                        priority: 20,
+                        click:    function() {
+                            if ( previous ) {
+                                frame.setState( previous );
+                            } else {
+                                frame.close();
+                            }
+                        }
+                    }
+                }
+            }) );
+        }
+    });
+
+    _.extend( media.controller.EditImage.prototype, media.selectionSync );
 
     /**
@@ -1928 +1990 @@
                 // Embed states.
                 new media.controller.Embed(),
+
+                new media.controller.EditImage( { selection: options.selection } ),
 
                 // Gallery states.
@@ -2044 +2108 @@
                 content: {
                     'embed':          'embedContent',
+                    'edit-image':     'editImageContent',
                     'edit-selection': 'editSelectionContent'
                 },
@@ -2196 +2261 @@
         },
 
+        editImageContent: function() {
+            var selection = this.state().get('selection'),
+                view = new media.view.EditImage( { model: selection.single(), controller: this } ).render();
+
+            this.content.set( view );
+
+            // after creating the wrapper view, load the actual editor via an ajax call
+            view.loadEditor();
+
+        },
+
         // Toolbars
 
@@ -2538 +2614 @@
             this.on( 'menu:create:image-details', this.createMenu, this );
             this.on( 'content:render:image-details', this.renderImageDetailsContent, this );
+            this.on( 'content:render:edit-image', this.editImageContent, this );
             this.on( 'menu:render:image-details', this.renderMenu, this );
             this.on( 'toolbar:render:image-details', this.renderImageDetailsToolbar, this );
@@ -2561 +2638 @@
                     priority:  80,
                     displaySettings: true
-                })
+                }),
+                new media.controller.EditImage( {
+                    image: this.image,
+                    selection: this.options.selection
+                } )
             ]);
         },
@@ -2575 +2656 @@
 
         },
+
+        editImageContent: function() {
+            var state = this.state(),
+                attachment = state.get('image').attachment,
+                model,
+                view;
+
+            if ( ! attachment ) {
+                return;
+            }
+
+            model = state.get('selection').single();
+
+            if ( ! model ) {
+                model = attachment;
+            }
+
+            view = new media.view.EditImage( { model: model, controller: this } ).render();
+
+            this.content.set( view );
+
+            // after bringing in the frame, load the actual editor via an ajax call
+            view.loadEditor();
+
+        },
+
 
         renderMenu: function( view ) {
@@ -5865 +5972 @@
         },
 
-        editAttachment: function() {
-            this.$el.addClass('needs-refresh');
+        editAttachment: function( event ) {
+            event.preventDefault();
+            this.controller.setState( 'edit-image' );
         },
         /**
@@ -5876 +5984 @@
             this.model.fetch();
         }
+
     });
 
@@ -6159 +6268 @@
         className: 'image-details',
         template:  media.template('image-details'),
-
+        events: _.defaults( media.view.Settings.AttachmentDisplay.prototype.events, {
+            'click .edit-attachment': 'editAttachment'
+        } ),
         initialize: function() {
             // used in AttachmentDisplay.prototype.updateLinkTo
             this.options.attachment = this.model.attachment;
+            if ( this.model.attachment ) {
+                this.listenTo( this.model.attachment, 'change:url', this.updateUrl );
+            }
             media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
         },
@@ -6177 +6291 @@
             }, this.options );
         },
-
 
         render: function() {
@@ -6199 +6312 @@
             this.$( '.caption textarea' ).focus();
             this.$( '.embed-image-settings' ).scrollTop( 0 );
-        }
+        },
+
+        updateUrl: function() {
+            this.$( '.thumbnail img' ).attr( 'src', this.model.get('url' ) );
+            this.$( '.url' ).val( this.model.get('url' ) );
+        },
+
+        editAttachment: function( event ) {
+            event.preventDefault();
+            this.controller.setState( 'edit-image' );
+        }
+    });
+
+
+    media.view.EditImage = media.View.extend({
+
+        className: 'image-editor',
+        template: media.template('image-editor'),
+
+        initialize: function( options ) {
+            this.editor = window.imageEdit;
+            this.controller = options.controller;
+            media.View.prototype.initialize.apply( this, arguments );
+        },
+
+        prepare: function() {
+            return this.model.toJSON();
+        },
+
+        render: function() {
+            media.View.prototype.render.apply( this, arguments );
+            return this;
+        },
+
+        loadEditor: function() {
+            this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
+        },
+
+        back: function() {
+            var lastState = this.controller.lastState();
+            this.controller.setState( lastState );
+        },
+
+        refresh: function() {
+            this.model.fetch();
+        },
+
+        save: function() {
+            var self = this,
+                lastState = this.controller.lastState();
+
+            this.model.fetch().done( function() {
+                self.controller.setState( lastState );
+            });
+        }
+
     });
 

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

@@ -560 +560 @@
                     <img src="{{ data.model.url }}" draggable="false" />
                 </div>
+                <# if ( data.attachment ) { #>
+                    <input type="button" class="edit-attachment button" value="<?php esc_attr_e( 'Edit Image' ); ?>" />
+                <# } #>
 
                 <div class="setting url">
@@ -648 +651 @@
             </div>
         </div>
+    </script>
+
+    <script type="text/html" id="tmpl-image-editor">
+        <div id="media-head-{{{ data.id }}}"></div>
+        <div id="image-editor-{{{ data.id }}}"></div>
     </script>
 

trunk/src/wp-includes/media.php

@@ -2176 +2176 @@
             'update' => false,
             'delete' => false,
+            'edit'   => false
         ),
         'editLink'   => false,
@@ -2182 +2183 @@
     if ( current_user_can( 'edit_post', $attachment->ID ) ) {
         $response['nonces']['update'] = wp_create_nonce( 'update-post_' . $attachment->ID );
+        $response['nonces']['edit'] = wp_create_nonce( 'image_editor-' . $attachment->ID );
         $response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
     }
@@ -2336 +2338 @@
         'update'      => __( 'Update' ),
         'replace'     => __( 'Replace' ),
+        'back'     => __( 'Back' ),
         /* translators: This is a would-be plural string used in the media manager.
            If there is not a word you can use in your language to avoid issues with the
@@ -2381 +2384 @@
         'imageReplaceTitle'     => __( 'Replace Image' ),
         'imageDetailsCancel'    => __( 'Cancel Edit' ),
+        'editImage'             => __( 'Edit Image' ),
 
         // Edit Image
@@ -2422 +2426 @@
     wp_enqueue_script( 'media-editor' );
     wp_enqueue_style( 'media-views' );
+    wp_enqueue_style( 'imgareaselect' );
     wp_plupload_default_settings();
 

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

@@ -390 +390 @@
     // 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' ), false, 1 );
+    $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-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
     $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );

trunk/src/wp-includes/version.php

@@ -5 +5 @@
  * @global string $wp_version
  */
-$wp_version = '3.9-alpha-27368-src';
+$wp_version = '3.9-alpha-27445-src';
 
 /**