Changeset 29072

Timestamp:

07/10/2014 06:09:46 PM (11 years ago)

Author:

wonderboymusic

Message:

Media Grid: hasNext and hasPrevious are functions that must be called. Otherwise they are always truthy properties.

See #24716.

File:

• trunk/src/wp-includes/js/media-grid.js (modified) (5 diffs)

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

@@ -433 +433 @@
             }
 
-            this.options.hasPrevious = ( this.options.library.indexOf( this.options.model ) > 0 ) ? true : false;
-            this.options.hasNext = ( this.options.library.indexOf( this.options.model ) < this.options.library.length - 1 ) ? true : false;
+            this.options.hasPrevious = this.hasPrevious();
+            this.options.hasNext = this.hasNext();
 
             // Initialize modal container view.
@@ -546 +546 @@
          */
         previousMediaItem: function() {
-            if ( ! this.options.hasPrevious )
+            if ( ! this.hasPrevious() ) {
                 return;
+            }
             this.modal.close();
             this.trigger( 'edit:attachment:previous', this.model );
@@ -556 +557 @@
          */
         nextMediaItem: function() {
-            if ( ! this.options.hasNext )
+            if ( ! this.hasNext() ) {
                 return;
+            }
             this.modal.close();
             this.trigger( 'edit:attachment:next', this.model );
@@ -589 +591 @@
             // The right arrow key
             if ( event.keyCode === 39 ) {
-                if ( ! this.hasNext ) {
+                if ( ! this.hasNext() ) {
                     return;
                 }
@@ -596 +598 @@
             // The left arrow key
             if ( event.keyCode === 37 ) {
-                if ( ! this.hasPrevious ) {
+                if ( ! this.hasPrevious() ) {
                     return;
                 }