diff --git a/lodash.js b/lodash.js index f63e08c95..bd8853aa4 100644 --- a/lodash.js +++ b/lodash.js @@ -146,6 +146,7 @@ var rsAstralRange = '\\ud800-\\udfff', rsAstral = '[' + rsAstralRange + ']', rsDigits = '\\d+', + rsDingbat = '[\\u2700-\\u27bf]', rsLowers = '[a-z\\xdf-\\xf6\\xf8-\\xff]+', rsNonAstral = '[^' + rsAstralRange + ']', rsRegional = '(?:\\ud83c[\\udde6-\\uddff]){2}', @@ -168,7 +169,7 @@ rsUpper + '+(?=' + rsUpper + rsLowers + ')', rsUpper + '?' + rsLowers, rsUpper + '+', - '(?:' + rsRegional + '|' + rsSurrPair + ')' + rsOptVS + rsJoiner, + '(?:' + [rsDingbat, rsRegional, rsSurrPair].join('|') + ')' + rsOptVS + rsJoiner, rsDigits ].join('|'), 'g'); diff --git a/test/test.js b/test/test.js index d6ef2062c..da69058e0 100644 --- a/test/test.js +++ b/test/test.js @@ -18972,9 +18972,9 @@ QUnit.test('should account for variation selectors', function(assert) { assert.expect(3); - assert.strictEqual(_.size(comboGlyph), 1); - assert.deepEqual(_.toArray(comboGlyph), [comboGlyph]); - assert.deepEqual(_.words(comboGlyph), [comboGlyph]); + assert.strictEqual(_.size(varHeart), 1); + assert.deepEqual(_.toArray(varHeart), [varHeart]); + assert.deepEqual(_.words(varHeart), [varHeart]); }); }());