Changeset 22397

Timestamp:

11/06/2012 01:19:39 AM (14 years ago)

Author:

koopersmith

Message:

Media JS: Move state-related logic from sidebar views to the state controllers. see #21390.

File:

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

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

@@ -185 +185 @@
 
                 activate: function() {
+                        var selection = this.get('selection');
+
                         // If we're in a workflow that supports multiple attachments,
                         // automatically select any uploading attachments.
@@ -190 +192 @@
                                 wp.Uploader.queue.on( 'add', this.selectUpload, this );
 
-                        this.get('selection').on( 'selection:single', this.buildDetails, this );
-                        this.get('selection').on( 'selection:unsingle', this.clearDetails, this );
+                        selection.on( 'selection:single', this.buildDetails, this );
+                        selection.on( 'selection:unsingle', this.clearDetails, this );
+                        selection.on( 'add remove reset', this.updateToolbarVisibility, this );
 
                         this._updateEmpty();
@@ -200 +203 @@
 
                 deactivate: function() {
-                        var toolbar = this._postLibraryToolbar;
-
-                        if ( toolbar )
-                                this.get('selection').off( 'add remove', toolbar.visibility, toolbar );
-
                         wp.Uploader.queue.off( 'add', this.selectUpload, this );
-                        this.get('selection').off( 'selection:single', this.buildDetails, this );
-                        this.get('selection').off( 'selection:unsingle', this.clearDetails, this );
+
+                        // Unbind all event handlers that use this state as the context
+                        // from the selection.
+                        this.get('selection').off( null, null, this );
                         this.get('library').off( 'add remove reset', this._updateEmpty, this );
                         this.off( 'change:empty', this.refresh, this );
@@ -213 +213 @@
 
                 toolbar: function() {
-                        var frame = this.frame,
-                                toolbar;
-
-                        // Toolbar.
-                        toolbar = this._postLibraryToolbar = new media.view.Toolbar.PostLibrary({
-                                controller: frame,
-                                state:      this
-                        });
-
-                        frame.toolbar( toolbar );
-                        this.get('selection').on( 'add remove', toolbar.visibility, toolbar );
+                        var frame = this.frame;
+
+                        frame.toolbar( new media.view.Toolbar.PostLibrary({
+                                controller: frame
+                        }) );
                 },
 
@@ -272 +266 @@
                 },
 
+                updateToolbarVisibility: function() {
+                        this.frame.toolbar().visibility();
+                },
+
                 selectUpload: function( attachment ) {
                         this.get('selection').add( attachment );
@@ -358 +356 @@
 
                 toolbar: function() {
-                        this.frame.toolbar( new media.view.Toolbar.Gallery({
-                                controller: this.frame,
-                                state:      this
+                        var frame = this.frame;
+                        frame.toolbar( new media.view.Toolbar.Gallery({
+                                controller: frame
                         }) );
                 },
@@ -409 +407 @@
                 toolbar: function() {
                         var frame = this.frame;
-
                         frame.toolbar( new media.view.Toolbar.GalleryAddImages({
-                                controller: frame,
-                                state:      this
+                                controller: frame
                         }) );
                 },
@@ -873 +869 @@
         media.view.Toolbar.PostLibrary = media.view.Toolbar.extend({
                 initialize: function() {
-                        var state = this.options.state,
-                                selection = state.get('selection'),
-                                controller = this.options.controller;
+                        var controller = this.options.controller,
+                                selection = controller.state().get('selection');
 
                         this.options.items = {
@@ -902 +897 @@
                                                         click: function() {
                                                                 controller.close();
-                                                                state.trigger( 'insert', selection );
+                                                                controller.state().trigger( 'insert', selection );
                                                                 selection.clear();
                                                         }
@@ -942 +937 @@
 
                 visibility: function() {
-                        var state = this.options.state,
-                                selection = state.get('selection'),
-                                controller = this.options.controller,
+                        var selection = this.controller.state().get('selection'),
                                 count = selection.length,
                                 showGallery;
@@ -967 +960 @@
         media.view.Toolbar.Gallery = media.view.Toolbar.extend({
                 initialize: function() {
-                        var state = this.options.state,
+                        var controller = this.options.controller,
+                                state = controller.state(),
                                 editing = state.get('editing'),
-                                library = state.get('library'),
-                                controller = this.options.controller;
+                                library = state.get('library');
 
                         this.options.items = {
@@ -978 +971 @@
                                         priority: 40,
                                         click:    function() {
+                                                var state = controller.state();
                                                 controller.close();
-                                                state.trigger( 'update', library );
+                                                state.trigger( 'update', state.get('library') );
                                                 controller.get('library').get('selection').clear();
                                                 controller.state('library');
@@ -991 +985 @@
                                         click: function() {
                                                 controller.get('gallery:add').set( 'selection', new media.model.Selection( library.models, {
-                                                        props:    library.props.toJSON(),
+                                                        props:    controller.state().get('library').props.toJSON(),
                                                         multiple: true
                                                 }) );
@@ -1019 +1013 @@
         media.view.Toolbar.GalleryAddImages = media.view.Toolbar.extend({
                 initialize: function() {
-                        var state = this.options.state,
-                                editing = state.get('editing'),
-                                library = state.get('library'),
-                                controller = this.options.controller;
+                        var controller = this.options.controller;
 
                         this.options.items = {
@@ -1031 +1022 @@
 
                                         click: function() {
-                                                controller.get('gallery').set( 'library', state.get('selection') );
+                                                controller.get('gallery').set( 'library', controller.state().get('selection') );
                                                 controller.state('gallery');
                                         }