robustify tickformatstops supplydefaults

plotly · alexcjohnson · Oct 16, 2017 · Aug 17, 2017 · Aug 23, 2017 · Aug 24, 2017
commit 0b48a3380376438a1b8821789e42f8e1106858c5
diff --git a/src/plots/cartesian/tick_label_defaults.js b/src/plots/cartesian/tick_label_defaults.js
@@ -83,8 +83,10 @@ function getShowAttrDflt(containerIn) {
 }

 function tickformatstopsDefaults(tickformatIn, tickformatOut) {
-    var valuesIn = tickformatIn.tickformatstops || [],
-        valuesOut = tickformatOut.tickformatstops = [];
+    var valuesIn = tickformatIn.tickformatstops;
+    var valuesOut = tickformatOut.tickformatstops = [];
+
+    if(!Array.isArray(valuesIn)) return;

    var valueIn, valueOut;

@@ -101,6 +103,4 @@ function tickformatstopsDefaults(tickformatIn, tickformatOut) {

        valuesOut.push(valueOut);
    }
-
-    return valuesOut;
 }
diff --git a/test/jasmine/tests/tickformatstops_test.js b/test/jasmine/tests/tickformatstops_test.js
@@ -289,4 +289,19 @@ describe('Test tickformatstops:', function() {
        .then(done);
    });

+    it('doesn\'t fail on bad input', function(done) {
+        var promise = Plotly.plot(gd, mockCopy.data, mockCopy.layout);
+
+        [1, {a: 1, b: 2}, 'boo'].forEach(function(v) {
+            promise = promise.then(function() {
+                return Plotly.relayout(gd, {'xaxis.tickformatstops': v});
+            }).then(function() {
+                expect(gd._fullLayout.xaxis.tickformatstops).toEqual([]);
+            });
+        });
+
+        promise
+        .catch(fail)
+        .then(done);
+    });
 });
-Original file line number
+Diff line change
@@ -83,8 +83,10 @@ function getShowAttrDflt(containerIn) {
     }
     function tickformatstopsDefaults(tickformatIn, tickformatOut) {
-        var valuesIn = tickformatIn.tickformatstops || [],
-            valuesOut = tickformatOut.tickformatstops = [];
+        var valuesIn = tickformatIn.tickformatstops;
+        var valuesOut = tickformatOut.tickformatstops = [];
+        if(!Array.isArray(valuesIn)) return;
         var valueIn, valueOut;
@@ -101,6 +103,4 @@ function tickformatstopsDefaults(tickformatIn, tickformatOut) {
             valuesOut.push(valueOut);
             Copy link

  
      
    
  

  
      

  
    Contributor


      

  

  
    
      

      
            etpinard
  

      

      

      


        Aug 23, 2017


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Nicely done. Thanks!
🎉
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
         }
-        return valuesOut;
     }