From c621af9d313b3ec2a71677b5c3312a8af8693d62 Mon Sep 17 00:00:00 2001
From: Tim McGee <github@mmconsult.com>
Date: Wed, 16 Dec 2015 13:17:59 -0800
Subject: [PATCH 1/3] Add new `_createMap` method to allow custom mixins to
 override the method. This is useful when using CMV with BootstrapMap
 (https://github.com/Esri/bootstrap-map-js).

---
 viewer/js/viewer/_MapMixin.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/viewer/js/viewer/_MapMixin.js b/viewer/js/viewer/_MapMixin.js
index 6b3c72027..8d272db58 100644
--- a/viewer/js/viewer/_MapMixin.js
+++ b/viewer/js/viewer/_MapMixin.js
@@ -27,8 +27,7 @@ define([
             var returnDeferred = new Deferred();
             var returnWarnings = [];
 
-            var container = dom.byId(this.config.layout.map) || 'mapCenter';
-            this.map = new Map(container, this.config.mapOptions);
+            this._createMap();
 
             if (this.config.mapOptions.basemap) {
                 this.map.on('load', lang.hitch(this, '_initLayers', returnWarnings));
@@ -44,6 +43,11 @@ define([
             return returnDeferred;
         },
 
+        _createMap: function () {
+            var container = dom.byId(this.config.layout.map) || 'mapCenter';
+            this.map = new Map(container, this.config.mapOptions);
+        },
+
         _onLayersAddResult: function (returnDeferred, returnWarnings, lyrsResult) {
             array.forEach(lyrsResult.layers, function (addedLayer) {
                 if (addedLayer.success !== true) {

From 2a7556e66469c2e5723d9e18e868614b0a1fa77f Mon Sep 17 00:00:00 2001
From: Tim McGee <github@mmconsult.com>
Date: Wed, 13 Jan 2016 08:31:11 -0800
Subject: [PATCH 2/3] remove duplicate rule i eslintrc

---
 .eslintrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index 891a5be59..d755fc467 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -153,7 +153,6 @@
         "consistent-this": [2, "self"],
         "constructor-super": 2,
         "func-style": [2, "declaration"],
-        "id-match": [2, "^[a-z]+([A-Z][a-z]+)*$", {"properties": true}],
         "indent": [2, 4],
         "key-spacing": [2, {
             "beforeColon": false,

From ac7efe6d5c299c687c565fd0b6ce92952e564c86 Mon Sep 17 00:00:00 2001
From: Tim McGee <github@mmconsult.com>
Date: Wed, 13 Jan 2016 08:36:35 -0800
Subject: [PATCH 3/3] remove another duplicate rule in eslintrc

---
 .eslintrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index d755fc467..c7653194b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -151,7 +151,6 @@
         "comma-style": 2,
         "computed-property-spacing": [2, "never"],
         "consistent-this": [2, "self"],
-        "constructor-super": 2,
         "func-style": [2, "declaration"],
         "indent": [2, 4],
         "key-spacing": [2, {