Changeset 28225 for branches/3.9

Timestamp:

05/01/2014 04:15:26 AM (12 years ago)

Author:

nacin

Message:

Customizer: Allow to skip cropping header images if image width is smaller than or equal to theme width.

Merges [28219] to the 3.9 branch.

fixes #27936.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-includes/js/customize-models.js (modified) (1 diff)
• tests/qunit/wp-admin/js/customize-header.js (modified) (1 diff)

branches/3.9/src/wp-includes/js/customize-models.js

@@ -114 +114 @@
                         }
 
+                        if (this.get('imageWidth') <= this.get('themeWidth')) {
+                                return false;
+                        }
+
                         return true;
                 }

branches/3.9/tests/qunit/wp-admin/js/customize-header.js

@@ -104 +104 @@
                         imageHeight: 8600
                 });
+
+                equal(this.model.shouldBeCropped(), false);
+        });
+
+        test('should not be cropped when the image width is smaller than or equal to theme width', function() {
+                this.model.set({
+                        themeFlexWidth: false,
+                        themeFlexHeight: false,
+                        imageWidth: 1000,
+                        imageHeight: 100
+                });
+
+                equal(this.model.shouldBeCropped(), false);
+        });
+
+        test('should not be cropped when the image width is smaller than or equal to theme width, theme supports flex height and width', function() {
+                this.model.set({
+                        themeFlexWidth: true,
+                        themeFlexHeight: true,
+                        imageWidth: 900,
+                        imageHeight: 100
+                });
+
                 equal(this.model.shouldBeCropped(), false);
         });