Merge branch 'master' into ternary

- Fx.unhover is now part of dragelement
- emit 'plotly_unhover' directly from pie/plot.js

# Conflicts:
#	src/plots/cartesian/graph_interact.js

Author: etpinard

CHANGELOG.md

@@ -9,6 +9,20 @@ 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.8.0] -- 2016-04-04
+
+### Added
+- Range slider functionality for scatter traces [#336, #368, #377]
+- Range selector functionality for cartesian and gl2d plot types [#373]
+- Support for connectgaps in scatter3d traces [#361]
+
+### Fixed
+- gl2d toImage mode bar button is now again functional (bug introduced in 1.7.0) [#369]
+- IE / Edge handling of getComputedTextLength is now functional [#376]
+- improved marker color attribute description [#366]
+
+
 ## [1.7.1] -- 2016-03-30
 
 ### Fixed

CONTRIBUTING.md

@@ -26,6 +26,7 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
 | `type: maintenace` | source code cleanup resulting in no enhancement for users | 
 | `type: duplicate` | *self-explanatory* |
 | `type: wontfix` | *self-explanatory* |
+| `status: discussion needed` | Issue or PR that required discussion among maintaners before moving forward |
 | `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 | 

README.md

@@ -55,15 +55,15 @@ If you would like to reduce the bundle size of plotly.js, you can create a *cust
 
 ```javascript
 // in custom-plotly.js
-var plotlyCore = require('plotly.js/lib/core');
+var Plotly = require('plotly.js/lib/core');
 
 // Load in the trace types for pie, and choropleth
-plotlyCore.register([
+Plotly.register([
     require('plotly.js/lib/pie'),
     require('plotly.js/lib/choropleth')
 ]);
 
-module.exports = plotlyCore;
+module.exports = Plotly;
 ```
 
 Then elsewhere in your code:

devtools/.eslintrc

@@ -3,5 +3,8 @@
   "env": {
     "node": true,
     "browser": true
+  },
+  "globals": {
+    "Promise": true
   }
 }

devtools/test_dashboard/buttons.js

@@ -0,0 +1,160 @@
+var Fuse = require('fuse.js');
+var mocks = require('../../build/test_dashboard_mocks.json');
+
+
+// Our gracious testing object
+var Tabs = {
+
+    // Return the specified plot container (or default one)
+    getGraph: function(id) {
+        id = id || 'graph';
+        return document.getElementById(id);
+    },
+
+    // Create a new plot container
+    fresh: function(id) {
+        id = id || 'graph';
+
+        var graphDiv = Tabs.getGraph(id);
+
+        if(graphDiv) {
+            graphDiv.remove();
+        }
+
+        graphDiv = document.createElement('div');
+        graphDiv.className = 'dashboard-plot';
+        graphDiv.id = id;
+
+        var plotArea = document.getElementById('plots');
+        plotArea.appendChild(graphDiv);
+
+        return graphDiv;
+    },
+
+    // Plot a mock by name (without .json) to the default or specified container
+    plotMock: function(mockName, id) {
+        var mockURL = '/test/image/mocks/' + mockName + '.json';
+
+        window.Plotly.d3.json(mockURL, function(err, fig) {
+            window.Plotly.plot(Tabs.fresh(id), fig.data, fig.layout);
+
+            console.warn('Plotting:', mockURL);
+        });
+    },
+
+    // Save a png snapshot and display it below the plot
+    snapshot: function(id) {
+        var gd = Tabs.getGraph(id);
+
+        if(!gd._fullLayout || !gd._fullData) {
+            return;
+        }
+
+        var image = new Image();
+
+        window.Plotly.Snapshot.toImage(gd, { format: 'png' }).on('success', function(img) {
+            image.src = img;
+
+            var imageDiv = document.getElementById('snapshot');
+            imageDiv.appendChild(image);
+
+            console.warn('Snapshot complete!');
+        });
+    },
+
+    // Remove all plots and snapshots from the page
+    purge: function() {
+        var plots = document.getElementsByClassName('dashboard-plot');
+        var images = document.getElementById('snapshot');
+
+        while(images.firstChild) {
+            images.removeChild(images.firstChild);
+        }
+
+        for(var i = 0; i < plots.length; i++) {
+            window.Plotly.purge(plots[i]);
+        }
+    },
+
+    // Specify what to do after each plotly.js script reload
+    onReload: function() {
+        return;
+    },
+
+    // Refreshes the plotly.js source without needing to refresh the page
+    reload: function() {
+        var source = document.getElementById('source');
+        var reloaded = document.getElementById('reload-time');
+
+        source.remove();
+
+        window.Plotly = null;
+
+        source = document.createElement('script');
+        source.id = 'source';
+        source.src = '../../build/plotly.js';
+
+        document.body.appendChild(source);
+
+        var reloadTime = new Date().toLocaleTimeString();
+        console.warn('plotly.js reloaded at ' + reloadTime);
+        reloaded.textContent = 'last reload at ' + reloadTime;
+
+        Tabs.onReload();
+    }
+};
+
+
+// Bind things to the window
+window.Tabs = Tabs;
+setInterval(function() {
+    window.gd = Tabs.getGraph() || Tabs.fresh();
+    window.fullLayout = window.gd._fullLayout;
+    window.fullData = window.gd._fullData;
+}, 1000);
+
+
+// Mocks search and plotting
+var f = new Fuse(mocks, {
+    keys: [{
+        name: 'name',
+        weight: 0.7
+    }, {
+        name: 'keywords',
+        weight: 0.3
+    }]
+});
+
+var searchBar = document.getElementById('mocks-search');
+var mocksList = document.getElementById('mocks-list');
+var plotArea = document.getElementById('plots');
+
+searchBar.addEventListener('keyup', function(e) {
+
+    // Clear results.
+    while(mocksList.firstChild) {
+        mocksList.removeChild(mocksList.firstChild);
+    }
+
+
+    var results = f.search(e.target.value);
+
+    results.forEach(function(r) {
+        var result = document.createElement('span');
+        result.className = 'search-result';
+        result.innerText = r.name;
+
+        result.addEventListener('click', function() {
+
+            // Clear plots and plot selected.
+            Tabs.purge();
+            Tabs.plotMock(r.file.slice(0, -5));
+        });
+
+        mocksList.appendChild(result);
+
+        var listWidth = mocksList.getBoundingClientRect().width;
+        var plotAreaWidth = Math.floor(window.innerWidth - listWidth);
+        plotArea.setAttribute('style', 'width: ' + plotAreaWidth + 'px;');
+    });
+});