From 5d8f69e0c500a7988f609367b74c2d45f1a89cef Mon Sep 17 00:00:00 2001 From: "Dominik Schilling (ocean90)" Date: Fri, 25 Apr 2014 14:20:05 +0000 Subject: [PATCH] Recent Posts Widget: Use `ob_end_flush()` instead of `ob_flush()`. `ob_end_flush()` flushes the output buffer *and* turns output buffering off, same as `ob_get_flush()`. props m_i_n. see #28009 for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@28217 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/customize-models.js | 4 ++++ tests/qunit/wp-admin/js/customize-header.js | 23 +++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/wp-includes/js/customize-models.js b/src/wp-includes/js/customize-models.js index 5fa62aeecc..5969be3963 100644 --- a/src/wp-includes/js/customize-models.js +++ b/src/wp-includes/js/customize-models.js @@ -113,6 +113,10 @@ return false; } + if (this.get('imageWidth') <= this.get('themeWidth')) { + return false; + } + return true; } }); diff --git a/tests/qunit/wp-admin/js/customize-header.js b/tests/qunit/wp-admin/js/customize-header.js index ba2895f47e..056e763d31 100644 --- a/tests/qunit/wp-admin/js/customize-header.js +++ b/tests/qunit/wp-admin/js/customize-header.js @@ -103,6 +103,29 @@ jQuery( function() { imageWidth: 10000, imageHeight: 8600 }); + + equal(this.model.shouldBeCropped(), false); + }); + + test('should not be cropped when the image width is smaller or equal as 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 or equal as 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); }); });