Fix #213: Throw away this.isArray()

bem · Jun 30, 2016 · caad627 · caad627
1 parent 26d0725
commit caad627
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 64 deletions.
diff --git a/lib/bemhtml/index.js b/lib/bemhtml/index.js
@@ -208,7 +208,7 @@ BEMHTML.prototype.renderMix = function renderMix(entity,
  visited[entity.jsClass] = true;
 
  // Transform mix to the single-item array if it's not array
- if (!utils.isArray(mix))
+ if (!Array.isArray(mix))
  mix = [ mix ];
 
  var classBuilder = this.classBuilder;

diff --git a/lib/bemxjst/context.js b/lib/bemxjst/context.js
@@ -26,7 +26,6 @@ function Context(bemxjst) {
 exports.Context = Context;
 
 Context.prototype._flush = null;
-Context.prototype.isArray = utils.isArray;
 
 Context.prototype.isSimple = utils.isSimple;
 

diff --git a/lib/bemxjst/index.js b/lib/bemxjst/index.js
@@ -272,7 +272,7 @@ BEMXJST.prototype._run = function _run(context) {
  var res;
  if (context === undefined || context === '' || context === null)
  res = this.runEmpty();
- else if (utils.isArray(context))
+ else if (Array.isArray(context))
  res = this.runMany(context);
  else if (
  context.html &&

diff --git a/lib/bemxjst/match.js b/lib/bemxjst/match.js
@@ -1,4 +1,3 @@
-var utils = require('./utils');
 var tree = require('./tree');
 var PropertyMatch = tree.PropertyMatch;
 var OnceMatch = tree.OnceMatch;
@@ -83,7 +82,7 @@ function MatchTemplate(mode, template) {
  for (var i = 0, j = 0; i < this.predicates.length; i++, j++) {
  var pred = template.predicates[i];
  if (pred instanceof PropertyMatch) {
- if (utils.isArray(pred.key))
+ if (Array.isArray(pred.key))
  this.predicates[j] = new MatchNested(this, pred);
  else
  this.predicates[j] = new MatchProperty(this, pred);

diff --git a/lib/bemxjst/utils.js b/lib/bemxjst/utils.js
@@ -1,12 +1,3 @@
-var toString = Object.prototype.toString;
-
-exports.isArray = Array.isArray;
-if (!exports.isArray) {
- exports.isArray = function isArrayPolyfill(obj) {
- return toString.call(obj) === '[object Array]';
- };
-}
-
 exports.xmlEscape = function(str) {
  return (str + '')
  .replace(/&/g, '&amp;')

diff --git a/test/bemcontext-isarray-test.js b/test/bemcontext-isarray-test.js