IE9 fixes - to make SVG maps compatible

src/components/drawing/index.js

@@ -112,6 +112,7 @@ drawing.lineGroupStyle = function(s, lw, lc, ld) {
 };
 
 drawing.dashLine = function(s, dash, lineWidth) {
+    lineWidth = +lineWidth || 0;
     var dlw = Math.max(lineWidth, 3);
 
     if(dash === 'solid') dash = '';

src/components/modebar/modebar.js

@@ -147,7 +147,7 @@ proto.createButton = function(config) {
     }
 
     button.setAttribute('data-toggle', config.toggle || false);
-    if(config.toggle) button.classList.add('active');
+    if(config.toggle) d3.select(button).classed('active', true);
 
     button.appendChild(this.createIcon(config.icon || Icons.question));
     button.setAttribute('data-gravity', config.gravity || 'n');

src/lib/index.js

@@ -556,6 +556,14 @@ lib.isIE = function() {
     return typeof window.navigator.msSaveBlob !== 'undefined';
 };
 
+/**
+ * Duck typing to recognize a d3 selection, mostly for IE9's benefit
+ * because it doesn't handle instanceof like modern browsers
+ */
+lib.isD3Selection = function(obj) {
+    return obj && (typeof obj.classed === 'function');
+};
+
 
 /**
  * Converts a string path to an object.

src/lib/loggers.js

@@ -28,11 +28,7 @@ loggers.log = function() {
             messages.push(arguments[i]);
         }
 
-        if(console.trace) {
-            console.trace.apply(console, messages);
-        } else {
-            console.log.apply(console, messages);
-        }
+        apply(console.trace || console.log, messages);
     }
 };
 
@@ -44,11 +40,7 @@ loggers.warn = function() {
             messages.push(arguments[i]);
         }
 
-        if(console.trace) {
-            console.trace.apply(console, messages);
-        } else {
-            console.log.apply(console, messages);
-        }
+        apply(console.trace || console.log, messages);
     }
 };
 
@@ -60,6 +52,21 @@ loggers.error = function() {
             messages.push(arguments[i]);
         }
 
-        console.error.apply(console, arguments);
+        apply(console.error, messages);
     }
 };
+
+/*
+ * Robust apply, for IE9 where console.log doesn't support
+ * apply like other functions do
+ */
+function apply(f, args) {
+    if(f.apply) {
+        f.apply(f, args);
+    }
+    else {
+        for(var i = 0; i < args.length; i++) {
+            f(args[i]);
+        }
+    }
+}

src/plots/cartesian/graph_interact.js

@@ -792,7 +792,9 @@ fx.loneHover = function(hoverItem, opts) {
 };
 
 fx.loneUnhover = function(containerOrSelection) {
-    var selection = containerOrSelection instanceof d3.selection ?
+    // duck type whether the arg is a d3 selection because ie9 doesn't
+    // handle instanceof like modern browsers do.
+    var selection = Lib.isD3Selection(containerOrSelection) ?
             containerOrSelection :
             d3.select(containerOrSelection);
 

src/traces/choropleth/attributes.js

@@ -37,7 +37,7 @@ module.exports = extendFlat({}, {
     marker: {
         line: {
             color: ScatterGeoMarkerLineAttrs.color,
-            width: ScatterGeoMarkerLineAttrs.width
+            width: extendFlat({}, ScatterGeoMarkerLineAttrs.width, {dflt: 1})
         }
     },
     hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {

src/traces/choropleth/plot.js

@@ -165,7 +165,7 @@ plotChoropleth.style = function(geo) {
                     d3.select(this)
                         .attr('fill', function(pt) { return sclFunc(pt.z); })
                         .call(Color.stroke, pt.mlc || markerLine.color)
-                        .call(Drawing.dashLine, '', pt.mlw || markerLine.width);
+                        .call(Drawing.dashLine, '', pt.mlw || markerLine.width || 0);
                 });
         });
 };

tasks/test_syntax.js

@@ -13,7 +13,7 @@ var bundleTestGlob = path.join(constants.pathToJasmineBundleTests, '**/*.js');
 
 // main
 assertJasmineSuites();
-assertHeaders();
+assertSrcContents();
 assertFileNames();
 assertCircularDeps();
 
@@ -44,8 +44,12 @@ function assertJasmineSuites() {
     });
 }
 
-// check for header in src and lib files
-function assertHeaders() {
+/*
+ * tests about the contents of source (and lib) files:
+ * - check for header comment
+ * - check that we don't have .classList
+ */
+function assertSrcContents() {
     var licenseSrc = constants.licenseSrc;
     var licenseStr = licenseSrc.substring(2, licenseSrc.length - 2);
     var logs = [];
@@ -56,7 +60,15 @@ function assertHeaders() {
 
             // parse through code string while keeping track of comments
             var comments = [];
-            falafel(code, {onComment: comments, locations: true}, function() {});
+            falafel(code, {onComment: comments, locations: true}, function(node) {
+                // look for .classList
+                if(node.type === 'MemberExpression') {
+                    var parts = node.source().split('.');
+                    if(parts[parts.length - 1] === 'classList') {
+                        logs.push(file + ' : contains .classList (IE failure)');
+                    }
+                }
+            });
 
             var header = comments[0];
 
@@ -70,7 +82,7 @@ function assertHeaders() {
             }
         });
 
-        log('correct headers in lib/ and src/', logs);
+        log('correct headers and contents in lib/ and src/', logs);
     });
 }
 

test/jasmine/tests/lib_test.js

@@ -1,6 +1,7 @@
 var Lib = require('@src/lib');
 var setCursor = require('@src/lib/setcursor');
 var overrideCursor = require('@src/lib/override_cursor');
+var config = require('@src/plot_api/plot_config');
 
 var d3 = require('d3');
 var Plotly = require('@lib');
@@ -1599,6 +1600,172 @@ describe('Test lib.js:', function() {
             expect(Lib.isPlotDiv({})).toBe(false);
         });
     });
+
+    describe('isD3Selection', function() {
+        var gd;
+
+        beforeEach(function() {
+            gd = createGraphDiv();
+        });
+
+        afterEach(function() {
+            destroyGraphDiv();
+            Plotly.setPlotConfig({ queueLength: 0 });
+        });
+
+        it('recognizes real and duck typed selections', function() {
+            var yesSelections = [
+                d3.select(gd),
+                // this is what got us into trouble actually - d3 selections can
+                // contain non-nodes - say for example d3 selections! then they
+                // don't work correctly. But it makes a convenient test!
+                d3.select(1),
+                // just showing what we actually do in this function: duck type
+                // using the `classed` method.
+                {classed: function(v) { return !!v; }}
+            ];
+
+            yesSelections.forEach(function(v) {
+                expect(Lib.isD3Selection(v)).toBe(true, v);
+            });
+        });
+
+        it('rejects non-selections', function() {
+            var notSelections = [
+                1,
+                'path',
+                [1, 2],
+                [[1, 2]],
+                {classed: 1},
+                gd
+            ];
+
+            notSelections.forEach(function(v) {
+                expect(Lib.isD3Selection(v)).toBe(false, v);
+            });
+        });
+    });
+
+    describe('loggers', function() {
+        var stashConsole,
+            stashLogLevel;
+
+        function consoleFn(name, hasApply, messages) {
+            var out = function() {
+                var args = [];
+                for(var i = 0; i < arguments.length; i++) args.push(arguments[i]);
+                messages.push([name, args]);
+            };
+
+            if(!hasApply) out.apply = undefined;
+
+            return out;
+        }
+
+        function mockConsole(hasApply, hasTrace) {
+            var out = {
+                MESSAGES: []
+            };
+            out.log = consoleFn('log', hasApply, out.MESSAGES);
+            out.error = consoleFn('error', hasApply, out.MESSAGES);
+
+            if(hasTrace) out.trace = consoleFn('trace', hasApply, out.MESSAGES);
+
+            return out;
+        }
+
+        beforeEach(function() {
+            stashConsole = window.console;
+            stashLogLevel = config.logging;
+        });
+
+        afterEach(function() {
+            window.console = stashConsole;
+            config.logging = stashLogLevel;
+        });
+
+        it('emits one console message if apply is available', function() {
+            var c = window.console = mockConsole(true, true);
+            config.logging = 2;
+
+            Lib.log('tick', 'tock', 'tick', 'tock', 1);
+            Lib.warn('I\'m', 'a', 'little', 'cuckoo', 'clock', [1, 2]);
+            Lib.error('cuckoo!', 'cuckoo!!!', {a: 1, b: 2});
+
+            expect(c.MESSAGES).toEqual([
+                ['trace', ['LOG:', 'tick', 'tock', 'tick', 'tock', 1]],
+                ['trace', ['WARN:', 'I\'m', 'a', 'little', 'cuckoo', 'clock', [1, 2]]],
+                ['error', ['ERROR:', 'cuckoo!', 'cuckoo!!!', {a: 1, b: 2}]]
+            ]);
+        });
+
+        it('falls back on console.log if no trace', function() {
+            var c = window.console = mockConsole(true, false);
+            config.logging = 2;
+
+            Lib.log('Hi');
+            Lib.warn(42);
+
+            expect(c.MESSAGES).toEqual([
+                ['log', ['LOG:', 'Hi']],
+                ['log', ['WARN:', 42]]
+            ]);
+        });
+
+        it('falls back on separate calls if no apply', function() {
+            var c = window.console = mockConsole(false, false);
+            config.logging = 2;
+
+            Lib.log('tick', 'tock', 'tick', 'tock', 1);
+            Lib.warn('I\'m', 'a', 'little', 'cuckoo', 'clock', [1, 2]);
+            Lib.error('cuckoo!', 'cuckoo!!!', {a: 1, b: 2});
+
+            expect(c.MESSAGES).toEqual([
+                ['log', ['LOG:']],
+                ['log', ['tick']],
+                ['log', ['tock']],
+                ['log', ['tick']],
+                ['log', ['tock']],
+                ['log', [1]],
+                ['log', ['WARN:']],
+                ['log', ['I\'m']],
+                ['log', ['a']],
+                ['log', ['little']],
+                ['log', ['cuckoo']],
+                ['log', ['clock']],
+                ['log', [[1, 2]]],
+                ['error', ['ERROR:']],
+                ['error', ['cuckoo!']],
+                ['error', ['cuckoo!!!']],
+                ['error', [{a: 1, b: 2}]]
+            ]);
+        });
+
+        it('omits .log at log level 1', function() {
+            var c = window.console = mockConsole(true, true);
+            config.logging = 1;
+
+            Lib.log(1);
+            Lib.warn(2);
+            Lib.error(3);
+
+            expect(c.MESSAGES).toEqual([
+                ['trace', ['WARN:', 2]],
+                ['error', ['ERROR:', 3]]
+            ]);
+        });
+
+        it('logs nothing at log level 0', function() {
+            var c = window.console = mockConsole(true, true);
+            config.logging = 0;
+
+            Lib.log(1);
+            Lib.warn(2);
+            Lib.error(3);
+
+            expect(c.MESSAGES).toEqual([]);
+        });
+    });
 });
 
 describe('Queue', function() {