From 242caaf08421766cf735ac911beee85f2a0f89ce Mon Sep 17 00:00:00 2001 From: Tom Reznick Date: Tue, 15 Nov 2016 10:39:09 -0500 Subject: [PATCH] [BUGFIX beta] Trim whitespace in Ember.String.w() --- packages/ember-runtime/lib/system/string.js | 2 +- packages/ember-runtime/tests/system/string/w_test.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/ember-runtime/lib/system/string.js b/packages/ember-runtime/lib/system/string.js index 307350e05bc..59cdfdc8eab 100644 --- a/packages/ember-runtime/lib/system/string.js +++ b/packages/ember-runtime/lib/system/string.js @@ -113,7 +113,7 @@ function loc(str, formats) { } function w(str) { - return str.split(/\s+/); + return str.trim().split(/\s+/); } function decamelize(str) { diff --git a/packages/ember-runtime/tests/system/string/w_test.js b/packages/ember-runtime/tests/system/string/w_test.js index 983e515512f..56afa446b01 100644 --- a/packages/ember-runtime/tests/system/string/w_test.js +++ b/packages/ember-runtime/tests/system/string/w_test.js @@ -29,3 +29,10 @@ QUnit.test('\'one two three\'.w() with tabs', function() { deepEqual('one\ttwo three'.w(), ['one', 'two', 'three']); } }); + +QUnit.test('\' one two three \'.w() with leading and trailing whitespace => [\'one\',\'two\', \'three\']', function() { + deepEqual(w(' one two three '), ['one', 'two', 'three']); + if (ENV.EXTEND_PROTOTYPES.String) { + deepEqual(' one two three '.w(), ['one', 'two', 'three']); + } +});