Merge branch 'master' into doeg-exp-request-store

doeg · doeg · commit c11beeb742b0 · 2015-10-22T12:53:47.000-04:00
diff --git a/image_server/test/mocks/boxplots_outlierColorDflt.json b/image_server/test/mocks/boxplots_outlierColorDflt.json
@@ -0,0 +1,60 @@
+{
+    "data": [
+        {
+            "y": [
+                0.75,
+                5.25,
+                5.5,
+                6,
+                6.2,
+                6.6,
+                6.8,
+                7,
+                7.2,
+                7.5,
+                7.5,
+                7.75,
+                8.15,
+                8.15,
+                8.65,
+                8.93,
+                9.2,
+                9.5,
+                10,
+                10.25,
+                11.5,
+                12,
+                16,
+                20.9,
+                22.3,
+                23.25
+            ],
+            "type": "box",
+            "marker": {
+                "outliercolor": "green"
+            },
+            "uid": "511258"
+        }
+    ],
+    "layout": {
+        "xaxis": {
+            "type": "category",
+            "range": [
+                -0.5,
+                0.5
+            ],
+            "autorange": true
+        },
+        "yaxis": {
+            "type": "linear",
+            "range": [
+                -0.5,
+                24.5
+            ],
+            "autorange": true
+        },
+        "height": 450,
+        "width": 1000,
+        "autosize": true
+    }
+}
diff --git a/image_server/test/test-images-baseline/boxplots_outlierColorDflt.png b/image_server/test/test-images-baseline/boxplots_outlierColorDflt.png
diff --git a/shelly/plotlyjs/static/plotlyjs/package.json b/shelly/plotlyjs/static/plotlyjs/package.json
@@ -15,6 +15,7 @@
     "convex-hull": "^1.0.3",
     "d3": "3.3.5",
     "delaunay-triangulate": "^1.1.6",
+    "es6-promise": "^3.0.2",
     "gl-error3d": "^1.0.0",
     "gl-line3d": "^1.0.1",
     "gl-mat4": "^1.1.2",
@@ -28,7 +29,6 @@
     "ndarray-fill": "^1.0.1",
     "ndarray-homography": "^1.0.0",
     "ndarray-ops": "^1.2.2",
-    "promise": "6.1.0",
     "right-now": "^1.0.0",
     "superscript-text": "^1.0.0",
     "through2": "^2.0.0",
diff --git a/shelly/plotlyjs/static/plotlyjs/src/boxes.js b/shelly/plotlyjs/static/plotlyjs/src/boxes.js
@@ -135,7 +135,7 @@ boxes.attributes = {
     marker: {
         outliercolor: {
             valType: 'color',
-            dflt: 'rgba(0,0,0,0)',
+            dflt: 'rgba(0, 0, 0, 0)',
             role: 'style',
             description: 'Sets the color of the outlier sample points.'
         },
@@ -155,7 +155,10 @@ boxes.attributes = {
             outliercolor: {
                 valType: 'color',
                 role: 'style',
-                description: 'Sets the border line color of the outlier sample points.'
+                description: [
+                    'Sets the border line color of the outlier sample points.',
+                    'Defaults to marker.color'
+                ].join(' ')
             },
             outlierwidth: {
                 valType: 'number',
@@ -252,7 +255,13 @@ boxes.supplyDefaults = function(traceIn, traceOut, defaultColor) {
 
     coerce('whiskerwidth');
     coerce('boxmean');
-    var boxpoints = coerce('boxpoints');
+
+    var outlierColorDflt = Plotly.Lib.coerce2(traceIn, traceOut, boxes.attributes, 'marker.outliercolor'),
+        lineoutliercolor = coerce('marker.line.outliercolor'),
+        boxpoints = outlierColorDflt || 
+                    lineoutliercolor ? coerce('boxpoints', 'suspectedoutliers') : 
+                    coerce('boxpoints');
+                    
     if(boxpoints) {
         coerce('jitter', boxpoints==='all' ? 0.3 : 0);
         coerce('pointpos', boxpoints==='all' ? -1.5 : 0);
@@ -265,8 +274,7 @@ boxes.supplyDefaults = function(traceIn, traceOut, defaultColor) {
         coerce('marker.line.width');
 
         if(boxpoints==='suspectedoutliers') {
-            coerce('marker.outliercolor');
-            coerce('marker.line.outliercolor', traceOut.marker.color);
+            coerce('marker.line.outliercolor', traceOut.marker.color)
             coerce('marker.line.outlierwidth');
         }
     }
diff --git a/shelly/plotlyjs/static/plotlyjs/src/contour.js b/shelly/plotlyjs/static/plotlyjs/src/contour.js
@@ -124,10 +124,9 @@ contour.supplyDefaults = function(traceIn, traceOut, defaultColor, layout) {
         return Plotly.Lib.coerce(traceIn, traceOut, contour.attributes, attr, dflt);
     }
 
-    var contourstart = coerce('contours.start'),
-        contourend = coerce('contours.end'),
-        validcont = contourstart!==undefined && contourend!==undefined,
-        autocontour = validcont ? coerce('autocontour', false) : coerce('autocontour');
+    var contourStart = Plotly.Lib.coerce2(traceIn, traceOut, contour.attributes, 'contours.start'),
+        contourEnd = Plotly.Lib.coerce2(traceIn, traceOut, contour.attributes, 'contours.end'),
+        autocontour = contourStart && contourEnd ? coerce('autocontour', false) : coerce('autocontour');
     if(autocontour) coerce('ncontours');
     else coerce('contours.size');
 
diff --git a/shelly/plotlyjs/static/plotlyjs/src/graph_interact.js b/shelly/plotlyjs/static/plotlyjs/src/graph_interact.js
@@ -121,25 +121,25 @@ fx.init = function(gd) {
                 })
                 .mouseout(function(evt) {
                 /*
-                 * !!! TERRIBLE HACK !!!
-                 *
-                 * For some reason, a 'mouseout' event is fired in IE on clicks
+                 * IMPORTANT: `fx.unhover(gd, evt)` has been commented out below
+                 * because in some browsers a 'mouseout' event is fired on clicks
                  * on the maindrag container before reaching the 'click' handler.
                  *
                  * This results in a call to `fx.unhover` before `fx.click` where
                  * `unhover` sets `gd._hoverdata` to `undefined` causing the call
                  * to `fx.click` to return early.
                  *
-                 * The hack below makes the 'mouseout' handler bypass
-                 * `fx.unhover` in IE.
-                 *
                  * Note that the 'mouseout' handler is called only when the mouse
-                 * cursor gets lost. Most 'unhover' calls happen from 'mousemove':
-                 * these are not affected by the hack below.
+                 * cursor gets lost. Most 'unhover' calls happen from 'mousemove';
+                 * these are not affected by the change below.
+                 *
+                 * Browsers where this behavior has been noticed:
+                 * - Chrome 46.0.2490.71
+                 * - Firefox 41.0.2
+                 * - IE 9, 10, 11
                  */
-                    if( Plotly.Lib.isIE() ) return;
-
-                    fx.unhover(gd,evt);
+                    // fx.unhover(gd, evt);
+                    return;
                 })
                 .click(function(evt){ fx.click(gd,evt); });
             // corner draggers
diff --git a/shelly/plotlyjs/static/plotlyjs/src/graph_obj.js b/shelly/plotlyjs/static/plotlyjs/src/graph_obj.js
@@ -150,6 +150,7 @@ plots.registerSubplot = function(subplotType, attr, idRoot, attributes) {
 
 // TODO separate the 'find subplot' step from the 'get subplot ids' step
 plots.getSubplotIds = function getSubplotIds(layout, type) {
+    if(plots.subplotsRegistry[type] === undefined) return [];
 
     // layout must be 'fullLayout' here
     if(type === 'cartesian') {
@@ -170,6 +171,8 @@ plots.getSubplotIds = function getSubplotIds(layout, type) {
 };
 
 plots.getSubplotIdsInData = function getSubplotsInData(data, type) {
+    if(plots.subplotsRegistry[type] === undefined) return [];
+
     var attr = plots.subplotsRegistry[type].attr,
         subplotIds = [],
         trace;
@@ -185,6 +188,8 @@ plots.getSubplotIdsInData = function getSubplotsInData(data, type) {
 };
 
 plots.getSubplotData = function getSubplotData(data, type, subplotId) {
+    if(plots.subplotsRegistry[type] === undefined) return [];
+
     var attr = plots.subplotsRegistry[type].attr,
         subplotData = [],
         trace;
diff --git a/shelly/plotlyjs/static/plotlyjs/src/histogram.js b/shelly/plotlyjs/static/plotlyjs/src/histogram.js
@@ -40,7 +40,6 @@ Plotly.Plots.register(Plotly.Heatmap, 'histogram2d',
 // histogram has its own calc function,
 // but uses Bars.plot to display
 // and Bars.setPositions for stacking and grouping
-
 function makeBinsAttr(axLetter) {
     return {
         start: {
@@ -218,13 +217,12 @@ histogram.supplyDefaults = function(traceIn, traceOut) {
     binDirections.forEach(function(binDirection){
         // data being binned - note that even though it's a little weird,
         // it's possible to have bins without data, if there's inferred data
-        var binstrt = coerce(binDirection + 'bins.start'),
-            binend = coerce(binDirection + 'bins.end'),
-            validbin = binstrt!==undefined && binend!==undefined,
-            autobin = validbin ? 
+        var binstrt = Plotly.Lib.coerce(traceIn, traceOut, histogram.attributes, binDirection + 'bins.start'),
+            binend = Plotly.Lib.coerce(traceIn, traceOut, histogram.attributes, binDirection + 'bins.end'),
+            autobin = binstrt && binend ? 
                 coerce('autobin' + binDirection, false) : 
                 coerce('autobin' + binDirection);
- 
+
         if(autobin) coerce('nbins' + binDirection);
         else coerce(binDirection + 'bins.size');
     });
diff --git a/shelly/plotlyjs/static/plotlyjs/src/lib/lib.js b/shelly/plotlyjs/static/plotlyjs/src/lib/lib.js
@@ -1652,6 +1652,14 @@ lib.coerce = function(containerIn, containerOut, attributes, attribute, dflt) {
     return propOut.get();
 };
 
+// use coerce to get attibute value if user input is valid, return attribute default
+// if user input it not valid or retun false if there is no user input.  
+lib.coerce2 = function(containerIn, containerOut, attributes, attribute, dflt) {
+    var propIn = lib.nestedProperty(containerIn, attribute),
+        propOut = lib.coerce(containerIn, containerOut, attributes, attribute, dflt);
+    return propIn.get() ? propOut : false;
+};
+
 // shortcut to coerce the three font attributes
 // 'coerce' is a lib.coerce wrapper with implied first three arguments
 lib.coerceFont = function(coerce, attr, dfltObj) {
diff --git a/shelly/plotlyjs/static/plotlyjs/src/plotly.js b/shelly/plotlyjs/static/plotlyjs/src/plotly.js
@@ -1,3 +1,5 @@
+require('es6-promise').polyfill();
+
 // order of requires should matter only for interdependencies
 // in attributes definitions. put the common modules first
 exports.Lib = require('./lib/lib');
@@ -58,9 +60,5 @@ exports.Snapshot = require('./snapshot/snapshot');
 // Queue for undo/redo
 exports.Queue = require('./queue');
 
-// promise polyfill, embed rather than requiring dependencies
-require('../../../../shelly/static/js/plugins/promise-1.0.0.min.js');
-require('../../../../shelly/static/js/plugins/promise-done-1.0.0.js');
-
 // exports d3 used in the bundle
 exports.d3 = require('d3');
diff --git a/shelly/plotlyjs/static/plotlyjs/src/plotschema.js b/shelly/plotlyjs/static/plotlyjs/src/plotschema.js
@@ -264,15 +264,23 @@ function getSubplotRegistry(traceType) {
 function handleSubplotObjs(layoutAttributes) {
     var subplotsRegistry = Plotly.Plots.subplotsRegistry;
 
-    var gl3dRegex = subplotsRegistry.gl3d.attrRegex,
-        geoRegex = subplotsRegistry.geo.attrRegex,
-        xaxisRegex = subplotsRegistry.cartesian.attrRegex.x,
-        yaxisRegex = subplotsRegistry.cartesian.attrRegex.y;
-
     Object.keys(layoutAttributes).forEach(function(k) {
-        if(gl3dRegex.test(k) || geoRegex.test(k) || xaxisRegex.test(k) || yaxisRegex.test(k)) {
-             layoutAttributes[k][IS_SUBPLOT_OBJ] = true;
-        }
+        Object.keys(subplotsRegistry).forEach(function(subplotType) {
+            var subplotRegistry = subplotsRegistry[subplotType],
+                isSubplotObj;
+
+            if(subplotType === 'cartesian') {
+                isSubplotObj = (
+                    subplotRegistry.attrRegex.x.test(k) ||
+                    subplotRegistry.attrRegex.y.test(k)
+                );
+            }
+            else {
+                isSubplotObj = subplotRegistry.attrRegex.test(k);
+            }
+
+            if(isSubplotObj) layoutAttributes[k][IS_SUBPLOT_OBJ] = true;
+        });
     });
 
     return layoutAttributes;
diff --git a/shelly/plotlyjs/static/plotlyjs/tests/lib_test.js b/shelly/plotlyjs/static/plotlyjs/tests/lib_test.js
@@ -494,6 +494,57 @@ describe('Test lib.js:', function() {
             });
         });
 
+    describe('coerce2', function() {
+        var coerce2 = Plotly.Lib.coerce2,
+            out;
+
+        it('should set a value and return the value it sets when user input is valid', function() {
+            var colVal = 'red',
+                sizeVal = 14,
+                attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
+                                      testSize: {valType: 'number', dflt: 20}}},
+                obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
+                outObj = {},
+                colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
+                sizeOut = coerce2(obj, outObj, attrs, 'testMarker.testSize');               
+
+            expect(colOut).toBe(colVal);
+            expect(colOut).toBe(outObj.testMarker.testColor);
+            expect(sizeOut).toBe(sizeVal);
+            expect(sizeOut).toBe(outObj.testMarker.testSize);
+        });
+
+        it('should set and return the default if the user input is not valid', function() {
+            var colVal = 'r',
+                sizeVal = 'aaaaah!',
+                attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
+                                      testSize: {valType: 'number', dflt: 20}}},
+                obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
+                outObj = {},
+                colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
+                sizeOut = coerce2(obj, outObj, attrs, 'testMarker.testSize');                
+
+            expect(colOut).toBe('rgba(0, 0, 0, 0)');
+            expect(sizeOut).toBe(outObj.testMarker.testSize);
+            expect(sizeOut).toBe(20);
+            expect(sizeOut).toBe(outObj.testMarker.testSize);
+        });
+
+        it('should return false if there is no user input', function() {
+            var colVal = null,
+                sizeVal = null, 
+                attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
+                                      testSize: {valType: 'number', dflt: 20}}},
+                obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
+                outObj = {},
+                colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
+                sizeOut = coerce2(obj, outObj, attrs, 'testMarker.testSize');                 
+
+            expect(colOut).toBe(false);
+            expect(sizeOut).toBe(false);
+        });
+    });
+
         describe('info_array valType', function() {
             var infoArrayAttrs = {
                     range: {
diff --git a/test-dashboard/package.json b/test-dashboard/package.json
@@ -11,6 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "glob": "^5.0.15",
-    "plotly": "^1.0.2"
+    "plotly": "^1.0.2",
+    "progress": "^1.1.8"
   }
 }
diff --git a/test-dashboard/test.js b/test-dashboard/test.js
@@ -32,5 +32,6 @@ plots['chrisp-nan-1'] = require('./testplots/chrisp-nan-1.json');
 plots['marker-arrays'] = require('./testplots/marker-arrays.json');
 plots['scatter3d-colorscale'] = require('./testplots/scatter3d-colorscale.json');
 plots['autocolorscale'] = require('./testplots/autocolorscale.json');
+plots['nan-holes'] = require('./testplots/nan-holes.json');
 
 plotButtons(plots, './testplots/');
diff --git a/test-dashboard/testplots/nan-holes.json b/test-dashboard/testplots/nan-holes.json
diff --git a/test-dashboard/testplots/nan-holes.png b/test-dashboard/testplots/nan-holes.png
diff --git a/test-dashboard/toolpanel-dashboard/index.html b/test-dashboard/toolpanel-dashboard/index.html
diff --git a/test-dashboard/toolpanel-dashboard/temp-build-css.sh b/test-dashboard/toolpanel-dashboard/temp-build-css.sh
diff --git a/test-dashboard/toolpanel-dashboard/ui.js b/test-dashboard/toolpanel-dashboard/ui.js
