Changeset 29066

Timestamp:

07/10/2014 04:01:49 PM (11 years ago)

Author:

wonderboymusic

Message:

Media Grid, remove unnecessary abstraction: wp.media.controller._State

Props ericlewis.
See #24716.

Location:

trunk/src/wp-includes/js

Files:

• media-grid.js (modified) (2 diffs)
• media-views.js (modified) (4 diffs)

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

@@ -18 +18 @@
      * @augments Backbone.Model
      */
-    media.controller.EditImageNoFrame = media.controller._State.extend({
+    media.controller.EditImageNoFrame = media.controller.State.extend({
         defaults: {
             id:      'edit-attachment',
@@ -30 +30 @@
         },
 
-        initialize: function() {
-            media.controller._State.prototype.initialize.apply( this, arguments );
-        },
-
+        _ready: function() {},
+
+        /**
+         * Override media.controller.State._postActivate, since this state doesn't
+         * include the regions expected there.
+         */
         _postActivate: function() {
             this._content();
             this._router();
-        },
-
-        deactivate: function() {
-            this.stopListening( this.frame );
         },
 

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

@@ -338 +338 @@
 
     /**
-     * A more abstracted state, because media.controller.State expects
-     * specific regions (menu, title, etc.) to exist on the frame, which do not
-     * exist in media.view.Frame.EditAttachment.
-     */
-    media.controller._State = Backbone.Model.extend({
-        constructor: function() {
-            this.on( 'activate', this._preActivate, this );
-            this.on( 'activate', this.activate, this );
-            this.on( 'activate', this._postActivate, this );
-            this.on( 'deactivate', this._deactivate, this );
-            this.on( 'deactivate', this.deactivate, this );
-            this.on( 'reset', this.reset, this );
-            this.on( 'ready', this.ready, this );
-            /**
-             * Call parent constructor with passed arguments
-             */
-            Backbone.Model.apply( this, arguments );
-        },
-
-        /**
-         * @abstract
-         */
-        ready: function() {},
-        /**
-         * @abstract
-         */
-        activate: function() {},
-        /**
-         * @abstract
-         */
-        deactivate: function() {},
-        /**
-         * @abstract
-         */
-        reset: function() {},
-        /**
-         * @access private
-         */
-        _preActivate: function() {
-            this.active = true;
-        },
-        /**
-         * @access private
-         */
-        _postActivate: function() {},
-        /**
-         * @access private
-         */
-        _deactivate: function() {
-            this.active = false;
-        }
-    });
-
-    /**
      * wp.media.controller.State
      *
@@ -401 +347 @@
      * @augments Backbone.Model
      */
-    media.controller.State = media.controller._State.extend({
+    media.controller.State = Backbone.Model.extend({
         constructor: function() {
             this.on( 'activate', this._preActivate, this );
@@ -417 +363 @@
             this.on( 'change:menu', this._updateMenu, this );
         },
-
+        /**
+         * @abstract
+         */
+        ready: function() {},
+        /**
+         * @abstract
+         */
+        activate: function() {},
+        /**
+         * @abstract
+         */
+        deactivate: function() {},
+        /**
+         * @abstract
+         */
+        reset: function() {},
         /**
          * @access private
@@ -424 +385 @@
             this._updateMenu();
         },
-
+        /**
+         * @access private
+        */
+        _preActivate: function() {
+            this.active = true;
+        },
         /**
          * @access private