Merge pull request #4558 from fredj/isArray_Array.isArray

Use isArray instead of Array.isArray
CesiumGS · Oct 31, 2016 · d60dfce · d60dfce
2 parents b097124 + 7b2d2d7
commit d60dfce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Source/Scene/UrlTemplateImageryProvider.js b/Source/Scene/UrlTemplateImageryProvider.js
@@ -12,6 +12,7 @@ define([
         '../Core/Event',
         '../Core/freezeObject',
         '../Core/GeographicTilingScheme',
+        '../Core/isArray',
         '../Core/loadJson',
         '../Core/loadText',
         '../Core/loadWithXhr',
@@ -35,6 +36,7 @@ define([
         Event,
         freezeObject,
         GeographicTilingScheme,
+        isArray,
         loadJson,
         loadText,
         loadWithXhr,
@@ -548,7 +550,7 @@ define([
             that._getFeatureInfoFormats = properties.getFeatureInfoFormats;
 
             that._subdomains = properties.subdomains;
-            if (Array.isArray(that._subdomains)) {
+            if (isArray(that._subdomains)) {
                 that._subdomains = that._subdomains.slice();
             } else if (defined(that._subdomains) && that._subdomains.length > 0) {
                 that._subdomains = that._subdomains.split('');

diff --git a/Source/Scene/WebMapTileServiceImageryProvider.js b/Source/Scene/WebMapTileServiceImageryProvider.js
@@ -8,6 +8,7 @@ define([
         '../Core/DeveloperError',
         '../Core/Event',
         '../Core/freezeObject',
+        '../Core/isArray',
         '../Core/objectToQuery',
         '../Core/queryToObject',
         '../Core/Rectangle',
@@ -24,6 +25,7 @@ define([
         DeveloperError,
         Event,
         freezeObject,
+        isArray,
         objectToQuery,
         queryToObject,
         Rectangle,
@@ -153,7 +155,7 @@ define([
         this._credit = typeof credit === 'string' ? new Credit(credit) : credit;
 
         this._subdomains = options.subdomains;
-        if (Array.isArray(this._subdomains)) {
+        if (isArray(this._subdomains)) {
             this._subdomains = this._subdomains.slice();
         } else if (defined(this._subdomains) && this._subdomains.length > 0) {
             this._subdomains = this._subdomains.split('');