Merge branch 'develop' into cleanup/migrate-to-eslint

Conflicts: viewer/js/gis/dijit/StreetView.js
cmv · Oct 28, 2015 · f04d63e · f04d63e
2 parents 15cbd8e + bb7f80c
commit f04d63e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/viewer/favicon.png b/viewer/favicon.png
diff --git a/viewer/index.html b/viewer/index.html
@@ -6,6 +6,10 @@
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="application-name" content="cmv">
+        <meta name="description" content="CMV - The Configurable Map Viewer. Community supported open source mapping framework. Works with the Esri JavaScript API, ArcGIS Server, ArcGIS Online and more. Make it your own!">
+        <meta name="author" content="cmv.io">
+        <link rel="shortcut icon" href="./favicon.png">
         <title>Configurable Map Viewer</title>
         <link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.14compact/esri/css/esri.css">
         <link rel="stylesheet" type="text/css" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">

diff --git a/viewer/js/gis/dijit/MapInfo.js b/viewer/js/gis/dijit/MapInfo.js
@@ -10,7 +10,7 @@ define([
     'dojo/dom-style',
     'dojo/number',
     'dojo/topic',
-    '//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.3/proj4.js',
+    '//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.12/proj4.js',
     'xstyle/css!./MapInfo/css/MapInfo.css'
 ], function (
     declare,

diff --git a/viewer/js/gis/dijit/StreetView.js b/viewer/js/gis/dijit/StreetView.js
@@ -1,6 +1,7 @@
 /*global google */
 /*eslint strict: 0*/
 define([
+<<<<<<< HEAD
     'dojo/_base/declare',
     'dijit/_WidgetBase',
     'dijit/_TemplatedMixin',
@@ -19,6 +20,26 @@ define([
     'dijit/MenuItem',
     '//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.3/proj4.js',
     'dojo/i18n!./StreetView/nls/resource',
+=======
+	'dojo/_base/declare',
+	'dijit/_WidgetBase',
+	'dijit/_TemplatedMixin',
+	'dijit/_WidgetsInTemplateMixin',
+	'dojo/_base/lang',
+	'dojo/aspect',
+	'dojo/topic',
+	'esri/layers/GraphicsLayer',
+	'esri/graphic',
+	'esri/renderers/SimpleRenderer',
+	'dojo/text!./StreetView/templates/StreetView.html',
+	'esri/symbols/PictureMarkerSymbol',
+	'dojo/dom-style',
+	'esri/geometry/Point',
+	'esri/SpatialReference',
+	'dijit/MenuItem',
+	'//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.12/proj4.js',
+	'dojo/i18n!./StreetView/nls/resource',
+>>>>>>> develop
 
     'dijit/form/Button',
     'xstyle/css!./StreetView/css/StreetView.css',