Merge remote-tracking branch 'upstream/master'

Author: mikolalysenko

.eslintrc

@@ -9,6 +9,7 @@
   "rules": {
     "no-trailing-spaces": [2],
     "no-multiple-empty-lines": [2, {"max": 2, "maxEOF": 1}],
+    "eol-last": [2],
     "linebreak-style": [2, "unix"],
     "indent": [2, 4, {"SwitchCase": 1}],
     "max-len": [0, 80],
@@ -32,9 +33,12 @@
     "space-before-function-paren": [2, "never"],
     "space-before-blocks": [2],
     "no-multi-spaces": [2],
+    "no-whitespace-before-property": [2],
+    "no-unexpected-multiline": [2],
     "space-infix-ops": [0, {"int32Hint": false}],
     "quotes": [2, "single"],
     "dot-notation": [2, {"allowKeywords": false}],
+    "operator-linebreak": [2, "after"],
     "eqeqeq": [2],
     "new-cap": [0],
     "no-redeclare": [2, {"builtinGlobals": true}],
@@ -44,7 +48,6 @@
     "no-use-before-define": [2, "nofunc"],
     "no-loop-func": [2],
     "no-console": [0],
-    "no-unexpected-multiline": [2],
     "no-unused-labels": [2]
   },
 }

CHANGELOG.md

@@ -9,6 +9,12 @@ https://github.com/plotly/plotly.js/compare/vX.Y.Z...master
 
 where X.Y.Z is the semver of most recent plotly.js release.
 
+## [1.6.3] -- 2016-03-07
+
+### Fixed
+-  Argument parsing for vertex and face colors of mesh3d traces is now
+   functional [#287]
+
 
 ## [1.6.2] -- 2016-03-03
 

CONTRIBUTING.md

@@ -20,12 +20,15 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
 
 | Label | Purpose |
 |--------|---------|
-| bug | bug report confirmed by a plotly team member |
-| enhancement | planned feature or task |
-| community | issue left open for community input and pull requests |
-| cleanup | source code cleanup resulting in no enhancement for users | 
-| duplicate | *self-explanatory* |
-| wontfix | *self-explanatory* |
+| `type: bug` | bug report confirmed by a plotly team member |
+| `type: enhancement` | planned feature or task |
+| `type: community` | issue left open for community input and pull requests |
+| `type: maintenace` | source code cleanup resulting in no enhancement for users | 
+| `type: duplicate` | *self-explanatory* |
+| `type: wontfix` | *self-explanatory* |
+| `status: in progress` | PRs that required some intial feedback but not ready to merge |
+| `status: reviewable` | PRs that are completed from the author's perspective |
+| `status: on hold` | PRs that are put on hold | 
 
 ### Development
 

devtools/test_dashboard/buttons.js

@@ -2,7 +2,7 @@
 
 var Lib = require('@src/lib');
 
-var plotlist = document.getElementById('plot-list');
+var plotList = document.getElementById('plot-list');
 var anchor = document.getElementById('embedded-graph');
 var image = document.getElementById('embedded-image');
 
@@ -14,31 +14,30 @@ anchor.style.height = '600px';
 anchor.style.width = '1000px';
 
 function plotButtons(plots, figDir) {
-
     Object.keys(plots).forEach(function(plotname) {
-
         var button = document.createElement('button');
 
         button.style.cssFloat = 'left';
         button.style.width = '100px';
         button.style.height = '40px';
-
         button.innerHTML = plotname;
 
-        plotlist.appendChild(button);
+        plotList.appendChild(button);
 
         button.addEventListener('click', function() {
-
             var myImage = new Image();
             myImage.src = figDir + plotname + '.png';
 
             image.innerHTML = '';
             image.appendChild(myImage);
 
-
-            anchor.innerHTML = '';
+            var currentGraphDiv = Tabs.getGraph();
+            if(currentGraphDiv) Plotly.purge(currentGraphDiv);
 
             gd = document.createElement('div');
+            gd.id = 'graph';
+
+            anchor.innerHTML = '';
             anchor.appendChild(gd);
 
             var plot = plots[plotname];
@@ -58,7 +57,7 @@ function plotButtons(plots, figDir) {
     snapshot.innerHTML = 'snapshot';
     snapshot.style.background = 'blue';
 
-    plotlist.appendChild(snapshot);
+    plotList.appendChild(snapshot);
 
     snapshot.addEventListener('click', function() {
 
@@ -111,7 +110,7 @@ function plotButtons(plots, figDir) {
     pummelButton.style.marginLeft = '25px';
     pummelButton.innerHTML = 'pummel3d';
     pummelButton.style.background = 'blue';
-    plotlist.appendChild(pummelButton);
+    plotList.appendChild(pummelButton);
 
     var i = 0;
     var mock = require('@mocks/gl3d_marker-color.json');
@@ -147,7 +146,7 @@ function plotButtons(plots, figDir) {
     scrapeButton.style.marginLeft = '25px';
     scrapeButton.innerHTML = 'scrape SVG';
     scrapeButton.style.background = 'blue';
-    plotlist.appendChild(scrapeButton);
+    plotList.appendChild(scrapeButton);
 
     scrapeButton.addEventListener('click', function() {
         Plotly.Snapshot.toSVG(Tabs.get());

devtools/test_dashboard/index.html

@@ -27,6 +27,7 @@
         getGraph: function() {
             return document.getElementById('embedded-graph').children[0];
         },
+
         fresh: function() {
             var anchor = document.getElementById('embedded-graph'),
                 graphDiv = Tabs.getGraph();
@@ -37,6 +38,7 @@
 
             return graphDiv;
         },
+
         plotMock: function(mockName) {
             var mockURL = '../../test/image/mocks/' + mockName + '.json';
 

dist/plotly-geo-assets.js

@@ -1,5 +1,5 @@
 /**
-* plotly.js v1.6.2
+* plotly.js v1.6.3
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.
 * Licensed under the MIT license
@@ -57537,7 +57537,7 @@ exports.svgAttrs = {
 var Plotly = require('./plotly');
 
 // package version injected by `npm run preprocess`
-exports.version = '1.6.2';
+exports.version = '1.6.3';
 
 // plot api
 exports.plot = Plotly.plot;
@@ -85077,13 +85077,13 @@ proto.update = function(data) {
         config.vertexIntensity = data.intensity;
         config.colormap = parseColorScale(data.colorscale);
     }
-    else if(data.vertexColor) {
-        this.color = data.vertexColor[0];
-        config.vertexColors = parseColorArray(data.vertexColor);
+    else if(data.vertexcolor) {
+        this.color = data.vertexcolors[0];
+        config.vertexColors = parseColorArray(data.vertexcolor);
     }
-    else if(data.faceColor) {
-        this.color = data.faceColor[0];
-        config.cellColors = parseColorArray(data.faceColor);
+    else if(data.facecolor) {
+        this.color = data.facecolor[0];
+        config.cellColors = parseColorArray(data.facecolor);
     }
     else {
         this.color = data.color;
@@ -85185,8 +85185,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     else {
         traceOut.showscale = false;
 
-        if('vertexColor' in traceIn) coerce('vertexColor');
-        else if('faceColor' in traceIn) coerce('faceColor');
+        if('vertexcolor' in traceIn) coerce('vertexcolor');
+        else if('facecolor' in traceIn) coerce('facecolor');
         else coerce('color', defaultColor);
     }
 

dist/plotly-with-meta.js

@@ -1,5 +1,5 @@
 /**
-* plotly.js v1.6.2
+* plotly.js v1.6.3
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.
 * Licensed under the MIT license
@@ -57269,7 +57269,7 @@ exports.svgAttrs = {
 var Plotly = require('./plotly');
 
 // package version injected by `npm run preprocess`
-exports.version = '1.6.2';
+exports.version = '1.6.3';
 
 // plot api
 exports.plot = Plotly.plot;
@@ -84124,13 +84124,13 @@ proto.update = function(data) {
         config.vertexIntensity = data.intensity;
         config.colormap = parseColorScale(data.colorscale);
     }
-    else if(data.vertexColor) {
-        this.color = data.vertexColor[0];
-        config.vertexColors = parseColorArray(data.vertexColor);
+    else if(data.vertexcolor) {
+        this.color = data.vertexcolors[0];
+        config.vertexColors = parseColorArray(data.vertexcolor);
     }
-    else if(data.faceColor) {
-        this.color = data.faceColor[0];
-        config.cellColors = parseColorArray(data.faceColor);
+    else if(data.facecolor) {
+        this.color = data.facecolor[0];
+        config.cellColors = parseColorArray(data.facecolor);
     }
     else {
         this.color = data.color;
@@ -84232,8 +84232,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     else {
         traceOut.showscale = false;
 
-        if('vertexColor' in traceIn) coerce('vertexColor');
-        else if('faceColor' in traceIn) coerce('faceColor');
+        if('vertexcolor' in traceIn) coerce('vertexcolor');
+        else if('facecolor' in traceIn) coerce('facecolor');
         else coerce('color', defaultColor);
     }
 

dist/plotly.js

@@ -1,6 +1,6 @@
 {
   "name": "plotly.js",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "The open source javascript graphing library that powers plotly",
   "license": "MIT",
   "main": "./lib/index.js",

dist/plotly.min.js

@@ -12,6 +12,6 @@ var saneTopojson = require('sane-topojson');
 
 
 // package version injected by `npm run preprocess`
-exports.version = '1.6.2';
+exports.version = '1.6.3';
 
 exports.topojson = saneTopojson;

package.json

@@ -15,7 +15,7 @@
 var Plotly = require('./plotly');
 
 // package version injected by `npm run preprocess`
-exports.version = '1.6.2';
+exports.version = '1.6.3';
 
 // plot api
 exports.plot = Plotly.plot;
@@ -28,6 +28,7 @@ exports.prependTraces = Plotly.prependTraces;
 exports.addTraces = Plotly.addTraces;
 exports.deleteTraces = Plotly.deleteTraces;
 exports.moveTraces = Plotly.moveTraces;
+exports.purge = Plotly.purge;
 exports.setPlotConfig = require('./plot_api/set_plot_config');
 exports.register = Plotly.register;
 

src/assets/geo_assets.js

@@ -53,7 +53,7 @@ var Events = {
          * events.
          */
         plotObj.emit = function(event, data) {
-            if(typeof $ !== 'undefined') {
+            if(typeof jQuery !== 'undefined') {
                 $(plotObj).trigger(event, data);
             }
 
@@ -76,7 +76,7 @@ var Events = {
          * If Jquery exists run all its handlers for this event and
          * collect the return value of the LAST handler function
          */
-        if(typeof $ !== 'undefined') {
+        if(typeof jQuery !== 'undefined') {
             jQueryHandlerValue = $(plotObj).triggerHandler(event, data);
         }
 
@@ -114,7 +114,19 @@ var Events = {
          */
         return jQueryHandlerValue !== undefined ? jQueryHandlerValue :
             nodeEventHandlerValue;
+    },
+
+    purge: function(plotObj) {
+        delete plotObj._ev;
+        delete plotObj.on;
+        delete plotObj.once;
+        delete plotObj.removeListener;
+        delete plotObj.removeAllListeners;
+        delete plotObj.emit;
+
+        return plotObj;
     }
+
 };
 
 module.exports = Events;

src/core.js

@@ -2406,6 +2406,39 @@ Plotly.relayout = function relayout(gd, astr, val) {
     });
 };
 
+/**
+ * Purge a graph container div back to its initial pre-Plotly.plot state
+ *
+ * @param {string id or DOM element} gd
+ *      the id or DOM element of the graph container div
+ */
+Plotly.purge = function purge(gd) {
+    gd = getGraphDiv(gd);
+
+    var fullLayout = gd._fullLayout || {},
+        fullData = gd._fullData || [];
+
+    // remove gl contexts
+    Plots.cleanPlot([], {}, fullData, fullLayout);
+
+    // purge properties
+    Plots.purge(gd);
+
+    // purge event emitter methods
+    Events.purge(gd);
+
+    // remove plot container
+    if(fullLayout._container) fullLayout._container.remove();
+
+    delete gd._context;
+    delete gd._replotPending;
+    delete gd._mouseDownTime;
+    delete gd._hmpixcount;
+    delete gd._hmlumcount;
+
+    return gd;
+};
+
 /**
  * Reduce all reserved margin objects to a single required margin reservation.
  *
@@ -2505,7 +2538,7 @@ function makePlotFramework(gd) {
     // Make the svg container
     fullLayout._paperdiv = fullLayout._container.selectAll('.svg-container').data([0]);
     fullLayout._paperdiv.enter().append('div')
-        .classed('svg-container',true)
+        .classed('svg-container', true)
         .style('position','relative');
 
     // Initial autosize