make annotation/shapes cleanLayout blocks more robust

- so that we *only* loop over arrays.

Author: etpinard

src/plot_api/helpers.js

@@ -102,7 +102,7 @@ exports.cleanLayout = function(layout) {
         }
     }
 
-    var annotationsLen = (layout.annotations || []).length;
+    var annotationsLen = Array.isArray(layout.annotations) ? layout.annotations.length : 0;
     for(i = 0; i < annotationsLen; i++) {
         var ann = layout.annotations[i];
 
@@ -124,7 +124,7 @@ exports.cleanLayout = function(layout) {
         cleanAxRef(ann, 'yref');
     }
 
-    var shapesLen = (layout.shapes || []).length;
+    var shapesLen = Array.isArray(layout.shapes) ? layout.shapes.length : 0;
     for(i = 0; i < shapesLen; i++) {
         var shape = layout.shapes[i];
 

test/jasmine/tests/plot_api_test.js

@@ -896,7 +896,7 @@ describe('Test plot api', function() {
         });
     });
 
-    describe('cleanData', function() {
+    describe('cleanData & cleanLayout', function() {
         var gd;
 
         beforeEach(function() {
@@ -1039,6 +1039,36 @@ describe('Test plot api', function() {
             expect(trace1.transforms.length).toEqual(1);
             expect(trace1.transforms[0].target).toEqual('y');
         });
+
+        it('should cleanup annotations / shapes refs', function() {
+            var data = [{}];
+
+            var layout = {
+                annotations: [
+                    { ref: 'paper' },
+                    null,
+                    { xref: 'x02', yref: 'y1' }
+                ],
+                shapes: [
+                    { xref: 'y', yref: 'x' },
+                    null,
+                    { xref: 'x03', yref: 'y1' }
+                ]
+            };
+
+            Plotly.plot(gd, data, layout);
+
+            expect(gd.layout.annotations[0]).toEqual({ xref: 'paper', yref: 'paper' });
+            expect(gd.layout.annotations[1]).toEqual(null);
+            expect(gd.layout.annotations[2]).toEqual({ xref: 'x2', yref: 'y' });
+
+            expect(gd.layout.shapes[0].xref).toBeUndefined();
+            expect(gd.layout.shapes[0].yref).toBeUndefined();
+            expect(gd.layout.shapes[1]).toEqual(null);
+            expect(gd.layout.shapes[2].xref).toEqual('x3');
+            expect(gd.layout.shapes[2].yref).toEqual('y');
+
+        });
     });
 
     describe('Plotly.newPlot', function() {