Merge branch 'develop' into feature/updated-basemaps-widget

# Conflicts: # viewer/js/config/basemaps.js
cmv · Apr 1, 2016 · cdfcc1c · cdfcc1c
2 parents 68e9b76 + 9266665
commit cdfcc1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/viewer/index.html b/viewer/index.html
@@ -11,7 +11,7 @@
         <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.15compact/esri/css/esri.css">
+        <link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.16compact/esri/css/esri.css">
         <link rel="stylesheet" type="text/css" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
         <link rel="stylesheet" type="text/css" href="css/theme/dbootstrap/dbootstrap.css">
         <link rel="stylesheet" type="text/css" href="css/main.css">
@@ -41,7 +41,7 @@
         <!--[if lt IE 9]>
             <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/4.0.3/es5-shim.min.js"></script>
         <![endif]-->
-        <script src="//js.arcgis.com/3.15compact/"></script>
+        <script src="//js.arcgis.com/3.16compact/"></script>
         <script src="js/config/app.js"></script>
     </body>
 </html>
diff --git a/viewer/js/gis/dijit/Bookmarks.js b/viewer/js/gis/dijit/Bookmarks.js
@@ -23,6 +23,7 @@ define([
 
             this.bookmarks = new Bookmarks({
                 map: this.map,
+                id: this.id + '_esri',
                 editable: this.editable,
                 bookmarks: lang.mixin(this.bookmarkItems, bookmarks)
             }, this.domNode);