Merge branch 'master' of github.com:ropensci/plotly into fix/subplot

Author: cpsievert

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js'
-Version: 3.4.7
+Version: 3.4.9
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Chris", "Parmer", role = c("aut", "cph"),

NEWS

@@ -1,3 +1,16 @@
+3.4.9 -- 25 Mar 2016
+
+BUGFIX:
+
+Upgrade to plotlyjs 1.7.0. Fixes #513
+
+
+3.4.8 -- 23 Mar 2016
+
+BUGFIX:
+
+* Safeguard against null fields in selections. See #530.
+
 3.4.7 -- 19 Mar 2016
 
 BUGFIX:

inst/htmlwidgets/lib/plotlyjs/plotly-latest.min.js

@@ -50,7 +50,7 @@ HTMLWidgets.widget({
           var tr = x.data[pt.curveNumber];
           // add on additional trace info, if it exists
           attachKey = function(keyName) {
-            if (tr.hasOwnProperty(keyName)) {
+            if (tr.hasOwnProperty(keyName) && tr[keyName] !== null) {
               if (typeof pt.pointNumber === "number") {
                 obj[keyName] = tr[keyName][pt.pointNumber];
               } else {