explicit window. for getComputedStyle

Author: alexcjohnson

src/plots/plots.js

@@ -213,12 +213,12 @@ plots.resize = function(gd) {
     return new Promise(function(resolve, reject) {
 
         function isHidden(gd) {
-            var display = getComputedStyle(gd).display;
+            var display = window.getComputedStyle(gd).display;
             return !display || display === 'none';
         }
 
         if(!gd || isHidden(gd)) {
-            reject(new Error('Resize must be passed a plot div element.'));
+            reject(new Error('Resize must be passed a displayed plot div element.'));
         }
 
         if(gd._redrawTimer) clearTimeout(gd._redrawTimer);

test/jasmine/assets/custom_assertions.js

@@ -49,14 +49,14 @@ exports.assertStyle = function(dims, color, opacity) {
 exports.assertHoverLabelStyle = function(g, expectation, msg, textSelector) {
     if(!msg) msg = '';
 
-    var path = g.select('path').node();
-    expect(getComputedStyle(path).fill).toBe(expectation.bgcolor, msg + ': bgcolor');
-    expect(getComputedStyle(path).stroke).toBe(expectation.bordercolor, msg + ': bordercolor');
-
-    var text = g.select(textSelector || 'text.nums').node();
-    expect(getComputedStyle(text).fontFamily.split(',')[0]).toBe(expectation.fontFamily, msg + ': font.family');
-    expect(parseInt(getComputedStyle(text).fontSize)).toBe(expectation.fontSize, msg + ': font.size');
-    expect(getComputedStyle(text).fill).toBe(expectation.fontColor, msg + ': font.color');
+    var pathStyle = window.getComputedStyle(g.select('path').node());
+    expect(pathStyle.fill).toBe(expectation.bgcolor, msg + ': bgcolor');
+    expect(pathStyle.stroke).toBe(expectation.bordercolor, msg + ': bordercolor');
+
+    var textStyle = window.getComputedStyle(g.select(textSelector || 'text.nums').node());
+    expect(textStyle.fontFamily.split(',')[0]).toBe(expectation.fontFamily, msg + ': font.family');
+    expect(parseInt(textStyle.fontSize)).toBe(expectation.fontSize, msg + ': font.size');
+    expect(textStyle.fill).toBe(expectation.fontColor, msg + ': font.color');
 };
 
 exports.assertClip = function(sel, isClipped, size, msg) {

test/jasmine/tests/geo_test.js

@@ -611,9 +611,9 @@ describe('Test geo interactions', function() {
                 .then(function() {
                     mouseEventScatterGeo('mousemove');
 
-                    var path = d3.selectAll('g.hovertext').select('path').node();
-                    expect(getComputedStyle(path).fill).toEqual('rgb(255, 0, 0)', 'bgcolor');
-                    expect(getComputedStyle(path).stroke).toEqual('rgb(0, 0, 255)', 'bordecolor[0]');
+                    var pathStyle = window.getComputedStyle(d3.select('g.hovertext path').node());
+                    expect(pathStyle.fill).toEqual('rgb(255, 0, 0)', 'bgcolor');
+                    expect(pathStyle.stroke).toEqual('rgb(0, 0, 255)', 'bordecolor[0]');
                 })
                 .then(done);
             });

test/jasmine/tests/page_test.js

@@ -68,7 +68,7 @@ describe('page rendering', function() {
             // visibility: hidden is inherited by all children (unless overridden
             // somewhere in the tree)
             allPresentationElements.each(function() {
-                expect(getComputedStyle(this).visibility).toBe('hidden');
+                expect(window.getComputedStyle(this).visibility).toBe('hidden');
             });
 
             gd3.style({visibility: null, display: 'none'});

test/jasmine/tests/plot_promise_test.js

@@ -470,9 +470,11 @@ describe('Plotly.___ methods', function() {
         });
 
         it('should return a rejected promise with no argument', function(done) {
-            Plotly.Plots.resize().then(null, function(err) {
+            Plotly.Plots.resize().then(function() {
+                expect(1).toBe(0, 'We were supposed to get an error.');
+            }, function(err) {
                 expect(err).toBeDefined();
-                expect(err.message).toBe('Resize must be passed a plot div element.');
+                expect(err.message).toBe('Resize must be passed a displayed plot div element.');
             }).then(done);
         });
     });

test/jasmine/tests/snapshot_test.js

@@ -230,8 +230,9 @@ describe('Plotly.Snapshot', function() {
             Plotly.plot(gd, subplotMock.data, subplotMock.layout).then(function() {
 
                 d3.select(gd).selectAll('text').each(function() {
-                    expect(getComputedStyle(this).visibility).toEqual('visible');
-                    expect(getComputedStyle(this).display).toEqual('block');
+                    var thisStyle = window.getComputedStyle(this);
+                    expect(thisStyle.visibility).toEqual('visible');
+                    expect(thisStyle.display).toEqual('block');
                 });
 
                 return Plotly.Snapshot.toSVG(gd);

test/jasmine/tests/ternary_test.js

@@ -125,11 +125,11 @@ describe('ternary plots', function() {
                 Lib.clearThrottle();
                 mouseEvent('mousemove', pointPos[0], pointPos[1]);
 
-                var path = d3.select('g.hovertext').select('path').node();
-                var text = d3.select('g.hovertext').select('text.nums').node();
+                var pathStyle = window.getComputedStyle(d3.select('g.hovertext path').node());
+                var textStyle = window.getComputedStyle(d3.select('g.hovertext text.nums').node());
 
-                expect(getComputedStyle(path).stroke).toEqual('rgb(0, 0, 255)', 'bordercolor');
-                expect(getComputedStyle(text).fontFamily).toEqual('Gravitas', 'font.family[0]');
+                expect(pathStyle.stroke).toEqual('rgb(0, 0, 255)', 'bordercolor');
+                expect(textStyle.fontFamily).toEqual('Gravitas', 'font.family[0]');
             })
             .then(done);
         });