Merge branch 'develop' into feature/add-vector-tile-layer

cmv · Nov 23, 2015 · a03ac76 · a03ac76
2 parents b1554d7 + 8c7fe83
commit a03ac76
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/viewer/js/gis/dijit/Identify.js b/viewer/js/gis/dijit/Identify.js
@@ -65,7 +65,7 @@ define([
                         // Identify (Feature Service), create an
                         // infoTemplate for the graphic features. Create
                         // it only if one does not already exist.
-                        if (layer.capabilities && layer.capabilities.toLowerCase().indexOf('data') < 0) {
+                        if (layer.capabilities && array.indexOf(layer.capabilities.toLowerCase(), 'data') < 0) {
                             if (!layer.infoTemplate) {
                                 var infoTemplate = this.getInfoTemplate(layer, layer.layerId);
                                 if (infoTemplate) {
@@ -200,7 +200,7 @@ define([
                 // handle feature layers that come from a feature service
                 // and may already have an info template
                 var layer = evt.graphic._layer;
-                if (layer.infoTemplate || (layer.capabilities && layer.capabilities.toLowerCase().indexOf('data') < 0)) {
+                if (layer.infoTemplate || (layer.capabilities && array.indexOf(layer.capabilities.toLowerCase(), 'data') < 0)) {
                     return false;
                 }
 
@@ -262,7 +262,7 @@ define([
                     } else if ((ref.declaredClass === 'esri.layers.FeatureLayer') && !isNaN(ref.layerId)) { // feature layer
                         // do not allow feature layer that does not support
                         // Identify (Feature Service)
-                        if (ref.capabilities && ref.capabilities.toLowerCase().indexOf('data') > 0) {
+                        if (ref.capabilities && array.indexOf(ref.capabilities.toLowerCase(), 'data') >= 0) {
                             layerIds = [ref.layerId];
                         }
                     } else if (ref.layerInfos) {

diff --git a/viewer/js/gis/dijit/LayerControl/controls/_DynamicFolder.js b/viewer/js/gis/dijit/LayerControl/controls/_DynamicFolder.js
@@ -36,7 +36,7 @@ define([
         postCreate: function () {
             this.inherited(arguments);
             // Should the control be visible or hidden?
-            if (this.control.controlOptions.layerIds && this.control.controlOptions.layerIds.indexOf(this.sublayerInfo.id) < 0) {
+            if (this.control.controlOptions.layerIds && array.indexOf(this.control.controlOptions.layerIds, this.sublayerInfo.id) < 0) {
                 domClass.add(this.domNode, 'layerControlHidden');
             }
             var checkNode = this.checkNode;

diff --git a/viewer/js/gis/dijit/LayerControl/controls/_DynamicSublayer.js b/viewer/js/gis/dijit/LayerControl/controls/_DynamicSublayer.js
@@ -46,7 +46,7 @@ define([
         postCreate: function () {
             this.inherited(arguments);
             // Should the control be visible or hidden?
-            if (this.control.controlOptions.layerIds && this.control.controlOptions.layerIds.indexOf(this.sublayerInfo.id) < 0) {
+            if (this.control.controlOptions.layerIds && array.indexOf(this.control.controlOptions.layerIds, this.sublayerInfo.id) < 0) {
                 domClass.add(this.domNode, 'layerControlHidden');
             }
             var checkNode = this.checkNode;

diff --git a/viewer/js/gis/dijit/StreetView.js b/viewer/js/gis/dijit/StreetView.js
@@ -22,7 +22,7 @@ define([
 
     'dijit/form/Button',
     'xstyle/css!./StreetView/css/StreetView.css',
-    'gis/plugins/async!//maps.google.com/maps/api/js?v=3&sensor=false'
+    'gis/plugins/async!//maps.google.com/maps/api/js?v=3'
 ], function (declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, lang, aspect, topic, GraphicsLayer, Graphic, SimpleRenderer, template, PictureMarkerSymbol, domStyle, Point, SpatialReference, MenuItem, proj4, i18n) {
 
     return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {