Merge pull request #685 from cmv/dojo-build-fixes

Dojo build fixes
cmv · Mar 3, 2017 · d6f840a · d6f840a
2 parents a9c1f92 + 9bab91b
commit d6f840a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/viewer/js/config/app.js b/viewer/js/config/app.js
@@ -15,6 +15,9 @@
             }, {
                 name: 'proj4js',
                 location: '//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.15'
+            }, {
+                name: 'flag-icon-css',
+                location: '//cdnjs.cloudflare.com/ajax/libs/flag-icon-css/2.8.0'
             }
         ]
     };

diff --git a/viewer/js/gis/dijit/Locale.js b/viewer/js/gis/dijit/Locale.js
@@ -19,7 +19,7 @@ define([
     'dojo/text!./Locale/templates/Locale.html',
     'dojo/i18n!./Locale/nls/resource',
 
-    'xstyle/css!https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/2.3.1/css/flag-icon.min.css',
+    'xstyle/css!flag-icon-css/css/flag-icon.min.css',
     'xstyle/css!./Locale/css/Locale.css'
 ], function (
     declare,
@@ -184,4 +184,4 @@ define([
             }
         }
     });
-});
+});
diff --git a/viewer/js/viewer/_WebMapMixin.js b/viewer/js/viewer/_WebMapMixin.js
@@ -5,9 +5,7 @@ define([
     'dojo/dom',
 
     'esri/arcgis/utils',
-    'esri/units',
-
-    'dojo/i18n!config/nls/main'
+    'esri/units'
 
 ], function (
     declare,
@@ -16,9 +14,7 @@ define([
     dom,
 
     arcgisUtils,
-    units,
-
-    i18n
+    units
 ) {
     return declare(null, {
         startup: function () {
@@ -162,7 +158,7 @@ define([
                         id: 'directions',
                         type: 'titlePane',
                         path: 'gis/dijit/Directions',
-                        title: i18n.viewer.widgets.directions,
+                        title: 'Directions',
                         open: false,
                         position: 999,
                         options: {
@@ -186,7 +182,7 @@ define([
                         id: 'measurement',
                         type: 'titlePane',
                         path: 'gis/dijit/Measurement',
-                        title: i18n.viewer.widgets.measure,
+                        title: 'Measurement',
                         open: false,
                         position: 999,
                         options: {