Changeset 22888

Timestamp:

11/28/2012 02:03:31 AM (12 years ago)

Author:

nacin

Message:

Ensure attachment modal details are saved before the attachment details view is destroyed. props koopersmith. fixes #22593.

File:

• trunk/wp-includes/js/media-views.js (modified) (12 diffs)

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

@@ -815 +815 @@
             }
 
+            views = views || [];
+
             if ( existing = this.get( selector ) ) {
                 views = _.isArray( views ) ? views : [ views ];
@@ -821 +823 @@
 
             if ( ! options || ! options.silent )
-                _.invoke( views, 'dispose', { silent: true });
+                _.invoke( views, 'dispose' );
 
             return this;
@@ -1015 +1017 @@
             var options;
 
+            if ( this.prepare )
+                options = this.prepare();
+
             this.views.detach();
 
             if ( this.template ) {
-                options = this.prepare ? this.prepare() : {};
+                options = options || {};
                 this.trigger( 'prepare', options );
                 this.$el.html( this.template( options ) );
@@ -2434 +2439 @@
         },
 
-        destroy: function() {
-            this.model.off( null, null, this );
-            this.remove();
+        dispose: function() {
+            this.updateAll();
+            media.View.prototype.dispose.apply( this, arguments );
+            return this;
         },
 
@@ -2463 +2469 @@
                 options.size = this.imageSize();
 
+            this.views.detach();
             this.$el.html( this.template( options ) );
 
@@ -2475 +2482 @@
                 this.select();
 
+            this.views.render();
             return this;
         },
@@ -2572 +2580 @@
         },
 
+        updateAll: function() {
+            var $settings = this.$('[data-setting]'),
+                model = this.model,
+                changed;
+
+            changed = _.chain( $settings ).map( function( el ) {
+                var $input = $('input, textarea, select, [value]', el ),
+                    setting, value;
+
+                if ( ! $input.length )
+                    return;
+
+                setting = $(el).data('setting');
+                value = $input.val();
+
+                // Record the value if it changed.
+                if ( model.get( setting ) !== value )
+                    return [ setting, value ];
+            }).compact().object().value();
+
+            if ( changed )
+                model.save( changed );
+        },
+
         removeFromLibrary: function( event ) {
             // Stop propagation so the model isn't selected.
@@ -2615 +2647 @@
         tagName:   'ul',
         className: 'attachments',
-        template:  media.template('attachments-css'),
+
+        cssTemplate: media.template('attachments-css'),
 
         events: {
@@ -2632 +2665 @@
             });
 
-            _.each(['add','remove'], function( method ) {
-                this.collection.on( method, function( attachment, attachments, options ) {
-                    this[ method ]( attachment, options.index );
-                }, this );
+            this._viewsByCid = {};
+
+            this.collection.on( 'add', function( attachment, attachments, options ) {
+                this.views.add( this.createAttachmentView( attachment ), {
+                    at: options.index
+                });
+            }, this );
+
+            this.collection.on( 'remove', function( attachment, attachments, options ) {
+                var view = this._viewsByCid[ attachment.cid ];
+                delete this._viewsByCid[ attachment.cid ];
+
+                if ( view )
+                    view.remove();
             }, this );
 
@@ -2665 +2708 @@
                 $css.remove();
 
-            media.view.Attachments.$head().append( this.template({
+            media.view.Attachments.$head().append( this.cssTemplate({
                 id:     this.el.id,
                 edge:   this.edge(),
@@ -2740 +2783 @@
         },
 
-        render: function() {
-            // If there are no elements, load some.
-            if ( ! this.collection.length ) {
+        createAttachmentView: function( attachment ) {
+            var view = new this.options.AttachmentView({
+                controller: this.controller,
+                model:      attachment,
+                collection: this.collection,
+                selection:  this.options.selection
+            });
+
+            return this._viewsByCid[ attachment.cid ] = view;
+        },
+
+        prepare: function() {
+            // Create all of the Attachment views, and replace
+            // the list in a single DOM operation.
+            if ( this.collection.length ) {
+                this.views.set( this.collection.map( this.createAttachmentView, this ) );
+
+            // If there are no elements, clear the views and load some.
+            } else {
+                this.views.unset();
                 this.collection.more().done( this.scroll );
-                this.$el.empty();
-                return this;
             }
-
-            // Otherwise, create all of the Attachment views, and replace
-            // the list in a single DOM operation.
-            this.$el.html( this.collection.map( function( attachment ) {
-                return new this.options.AttachmentView({
-                    controller: this.controller,
-                    model:      attachment,
-                    collection: this.collection,
-                    selection:  this.options.selection
-                }).render().$el;
-            }, this ) );
-
-            return this;
         },
 
@@ -2766 +2811 @@
             // threshold to query for additional attachments.
             this.scroll();
-        },
-
-        add: function( attachment, index ) {
-            var view, children;
-
-            view = new this.options.AttachmentView({
-                controller: this.controller,
-                model:      attachment,
-                collection: this.collection,
-                selection:  this.options.selection
-            }).render();
-
-            children = this.$el.children();
-
-            if ( children.length > index )
-                children.eq( index ).before( view.$el );
-            else
-                this.$el.append( view.$el );
-        },
-
-        remove: function( attachment, index ) {
-            var children = this.$el.children();
-            if ( children.length )
-                children.eq( index ).detach();
         },