fix and 🔒 basePlotModules sorting

Author: etpinard

src/plots/sort_modules.js

@@ -8,23 +8,15 @@
 
 'use strict';
 
-function sortBasePlotModules(a, b) {
-    var nameA = a.name;
-    var nameB = b.name;
-
-    // always plot splom before cartesian (i.e. scattergl traces)
-    if(nameB === 'splom' && nameA === 'cartesian') {
-        return 1;
-    }
+// always plot splom before cartesian (i.e. scattergl traces)
+function sortModules(a, b) {
+    if(a === 'splom') return -1;
+    if(b === 'splom') return 1;
     return 0;
 }
 
-function sortModules(a, b) {
-    // always plot splom before scattergl traces
-    if(b === 'splom' && a === 'scattergl') {
-        return 1;
-    }
-    return 0;
+function sortBasePlotModules(a, b) {
+    return sortModules(a.name, b.name);
 }
 
 module.exports = {

test/jasmine/tests/plots_test.js

@@ -13,7 +13,6 @@ describe('Test Plots', function() {
     'use strict';
 
     describe('Plots.supplyDefaults', function() {
-
         it('should not throw an error when gd is a plain object', function() {
             var height = 100,
                 gd = {
@@ -154,6 +153,26 @@ describe('Test Plots', function() {
 
             testSanitizeMarginsHasBeenCalledOnlyOnce(gd);
         });
+
+        it('should sort base plot modules on fullLayout object', function() {
+            var gd = Lib.extendDeep({}, require('@mocks/plot_types.json'));
+            gd.data.unshift({type: 'scattergl'});
+            gd.data.push({type: 'splom'});
+
+            supplyAllDefaults(gd);
+            var names = gd._fullLayout._basePlotModules.map(function(m) {
+                return m.name;
+            });
+
+            expect(names).toEqual([
+                'splom',
+                'cartesian',
+                'gl3d',
+                'geo',
+                'pie',
+                'ternary'
+            ]);
+        });
     });
 
     describe('Plots.supplyLayoutGlobalDefaults should', function() {