Merge branch 'master' into custom-modebar

Author: etpinard

package.json

@@ -41,7 +41,6 @@
     "3d-view": "^2.0.0",
     "alpha-shape": "^1.0.0",
     "arraytools": "^1.0.0",
-    "browserify": "^12.0.1",
     "convex-hull": "^1.0.3",
     "d3": "3.5.6",
     "delaunay-triangulate": "^1.1.6",
@@ -73,14 +72,13 @@
     "robust-orientation": "^1.1.3",
     "sane-topojson": "^1.2.0",
     "superscript-text": "^1.0.0",
-    "through2": "^2.0.0",
     "tinycolor2": "1.1.2",
     "topojson": "^1.6.19",
-    "uglify-js": "^2.5.0",
     "xml2js": "^0.4.15"
   },
   "devDependencies": {
     "brfs": "^1.4.1",
+    "browserify": "^12.0.1",
     "browserify-transform-tools": "^1.5.0",
     "ecstatic": "^1.2.0",
     "jasmine-core": "^2.3.4",
@@ -93,6 +91,8 @@
     "karma-jasmine": "^0.3.6",
     "open": "0.0.5",
     "prettysize": "0.0.3",
-    "watchify": "^3.6.0"
+    "through2": "^2.0.0",
+    "watchify": "^3.6.0",
+    "uglify-js": "^2.5.0"
   }
 }

src/assets/geo_assets.js

@@ -9,4 +9,7 @@
 
 var saneTopojson = require('sane-topojson');
 
+// export the version found in the package.json
+exports.version = require('../../package.json').version;
+
 exports.topojson = saneTopojson;

src/components/drawing/index.js

@@ -296,8 +296,11 @@ var TEXTOFFSETSIGN = {start:1, end:-1, middle:0, bottom:1, top:-1},
     LINEEXPAND = 1.3;
 drawing.textPointStyle = function(s, trace) {
     s.each(function(d){
-        var p = d3.select(this);
-        if(!d.tx && !trace.text) {
+        var p = d3.select(this),
+            text = d.tx || trace.text;
+        if(!text || Array.isArray(text)) {
+            // isArray test handles the case of (intentionally) missing
+            // or empty text within a text array
             p.remove();
             return;
         }
@@ -320,7 +323,7 @@ drawing.textPointStyle = function(s, trace) {
                 fontSize,
                 d.tc || trace.textfont.color)
             .attr('text-anchor',h)
-            .text(d.tx || trace.text)
+            .text(text)
             .call(Plotly.util.convertToTspans);
         var pgroup = d3.select(this.parentNode),
             tspans = p.selectAll('tspan.line'),

src/fonts/ploticon/_ploticon.scss

@@ -39,4 +39,5 @@
 .ploticon-3d_rotate:before { content: '\e80c'; } /* '' */
 .ploticon-camera:before { content: '\e80d'; } /* '' */
 .ploticon-movie:before { content: '\e80e'; } /* '' */
-.ploticon-disk:before { content: '\e80f'; } /* '' */
+.ploticon-question:before { content: '\e80f'; } /* '' */
+.ploticon-disk:before { content: '\e810'; } /* '' */

src/fonts/ploticon/config.json

@@ -1468,6 +1468,12 @@
       "code": 59394,
       "src": "fontawesome"
     },
+    {
+      "uid": "17ebadd1e3f274ff0205601eef7b9cc4",
+      "css": "question",
+      "code": 59407,
+      "src": "fontawesome"
+    },
     {
       "uid": "d7271d490b71df4311e32cdacae8b331",
       "css": "home",
@@ -1479,6 +1485,12 @@
       "css": "undo",
       "code": 59392,
       "src": "fontawesome"
+    },
+    {
+      "uid": "f4445feb55521283572ee88bc304f928",
+      "css": "disk",
+      "code": 59408,
+      "src": "fontawesome"
     }
   ]
 }

src/fonts/ploticon/ploticon.eot

@@ -16,6 +16,9 @@
 
 var Plotly = require('./plotly');
 
+// export the version found in the package.json
+exports.version = require('../package.json').version;
+
 // plot api
 exports.plot = Plotly.plot;
 exports.newPlot = Plotly.newPlot;