override createMap method if mixin returns a deferred

- as a result, order is not important with map/webmap mixins
cmv · Jan 20, 2017 · 76ef0db · 76ef0db
1 parent 6f319d7
commit 76ef0db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/viewer/js/config/app.js b/viewer/js/config/app.js
@@ -51,10 +51,10 @@
     ) {
         var App = declare([
             _LayoutMixin,
-            _MapMixin,
             _WidgetsMixin,
 
             _WebMapMixin,
+            _MapMixin,
             _ConfigMixin,
             _ControllerBase
         ]);

diff --git a/viewer/js/viewer/_MapMixin.js b/viewer/js/viewer/_MapMixin.js
@@ -47,14 +47,22 @@ define([
         },
 
         createMap: function (returnWarnings) {
+
+            // mixins override the default createMap method and return a deferred
+            var result = this.inherited(arguments);
+            if (result) {
+                return result;
+            }
+
+            // otherwise we can create the map
             var returnWarnings = [];
             var mapDeferred = new Deferred(),
                 container = dom.byId(this.config.layout.map) || 'mapCenter';
 
             this.map = new Map(container, this.config.mapOptions);
 
             // let some other mixins modify or add map items async
-            var wait = this.inherited(arguments);
+            wait = this.inherited(arguments) || wait;
             if (wait) {
                 wait.then(function (warnings) {
                     // are warnings passed?

diff --git a/viewer/js/viewer/_WebMapMixin.js b/viewer/js/viewer/_WebMapMixin.js
@@ -29,6 +29,7 @@ define([
         },
 
         createMap: function () {
+            console.log('web map mixin');
             var webMapOptions = this.config.webMapOptions || {};
             if (!webMapOptions.mapOptions && this.config.mapOptions) {
                 webMapOptions.mapOptions = this.config.mapOptions;