validate input when calling from coerce2

 - fixup lib and axes tests
 - add info about Lib.coerce2 function

Author: archmoj

src/lib/coerce.js

@@ -364,7 +364,9 @@ exports.coerce = function(containerIn, containerOut, attributes, attribute, dflt
     return _coerce(containerIn, containerOut, attributes, attribute, dflt).val;
 };
 
-function _coerce(containerIn, containerOut, attributes, attribute, dflt) {
+function _coerce(containerIn, containerOut, attributes, attribute, dflt, opts) {
+    var shouldValidate = (opts || {}).shouldValidate;
+
     var attr = nestedProperty(attributes, attribute).get();
     if(dflt === undefined) dflt = attr.dflt;
     var src = ''; // i.e. default
@@ -376,7 +378,7 @@ function _coerce(containerIn, containerOut, attributes, attribute, dflt) {
     var template = containerOut._template;
     if(valIn === undefined && template) {
         valIn = nestedProperty(template, attribute).get();
-        if(valIn !== undefined) src = 't'; // template
+        if(valIn !== undefined && shouldValidate && validate(valIn, attr)) src = 't'; // template
 
         // already used the template value, so short-circuit the second check
         template = 0;
@@ -401,7 +403,7 @@ function _coerce(containerIn, containerOut, attributes, attribute, dflt) {
     coerceFunction(valIn, propOut, dflt, attr);
 
     var valOut = propOut.get();
-    if(valOut !== undefined) src = 'c'; // container
+    if(valOut !== undefined && shouldValidate && validate(valIn, attr)) src = 'c'; // container
 
     // in case v was provided but invalid, try the template again so it still
     // overrides the regular default
@@ -410,7 +412,7 @@ function _coerce(containerIn, containerOut, attributes, attribute, dflt) {
         coerceFunction(valIn, propOut, dflt, attr);
         valOut = propOut.get();
 
-        if(valOut !== undefined) src = 't'; // template
+        if(valOut !== undefined && shouldValidate && validate(valIn, attr)) src = 't'; // template
     }
 
     return {
@@ -422,13 +424,17 @@ function _coerce(containerIn, containerOut, attributes, attribute, dflt) {
 
 /**
  * Variation on coerce
+ * useful when setting an attribute to a valid value
+ * can change the default for another attribute.
  *
  * Uses coerce to get attribute value if user input is valid,
  * returns attribute default if user input it not valid or
  * returns false if there is no user input.
  */
 exports.coerce2 = function(containerIn, containerOut, attributes, attribute, dflt) {
-    var out = _coerce(containerIn, containerOut, attributes, attribute, dflt);
+    var out = _coerce(containerIn, containerOut, attributes, attribute, dflt, {
+        shouldValidate: true
+    });
     return (out.src && out.inp !== undefined) ? out.val : false;
 };
 

test/jasmine/tests/axes_test.js

@@ -1803,10 +1803,10 @@ describe('Test axes', function() {
             Plotly.plot(gd, data, layout);
 
             var yaxis = gd._fullLayout.yaxis;
-            expect(yaxis.ticklen).toBe(5);
-            expect(yaxis.tickwidth).toBe(1);
-            expect(yaxis.tickcolor).toBe('#444');
-            expect(yaxis.ticks).toBe('outside');
+            expect(yaxis.ticklen).toBe(undefined);
+            expect(yaxis.tickwidth).toBe(undefined);
+            expect(yaxis.tickcolor).toBe(undefined);
+            expect(yaxis.ticks).toBe('');
             expect(yaxis.showticklabels).toBe(true);
             expect(yaxis.tickfont).toEqual({ family: '"Open Sans", verdana, arial, sans-serif', size: 12, color: '#444' });
             expect(yaxis.tickangle).toBe('auto');

test/jasmine/tests/lib_test.js

@@ -792,10 +792,10 @@ describe('Test lib.js:', function() {
                 var colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor');
                 var sizeOut = coerce2(obj, outObj, attrs, 'testMarker.testSize');
 
-                expect(colOut).toBe('rgba(0, 0, 0, 0)');
-                expect(colOut).toBe(outObj.testMarker.testColor);
-                expect(sizeOut).toBe(20);
-                expect(sizeOut).toBe(outObj.testMarker.testSize);
+                expect(colOut).toBe(false);
+                expect(outObj.testMarker.testColor).toBe('rgba(0, 0, 0, 0)');
+                expect(sizeOut).toBe(false);
+                expect(outObj.testMarker.testSize).toBe(20);
             });
 
             it('should set the user input', function() {
@@ -842,7 +842,7 @@ describe('Test lib.js:', function() {
                 expect(sizeOut).toBe(outObj.testMarker.testSize);
             });
 
-            it('should set to default if the both container and template inputs are not valid', function() {
+            it('should set to default and return false if the both container and template inputs are not valid', function() {
                 var attrs = {
                     testMarker: {
                         testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
@@ -860,10 +860,10 @@ describe('Test lib.js:', function() {
                 var colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor');
                 var sizeOut = coerce2(obj, outObj, attrs, 'testMarker.testSize');
 
-                expect(colOut).toBe('rgba(0, 0, 0, 0)');
-                expect(colOut).toBe(outObj.testMarker.testColor);
-                expect(sizeOut).toBe(20);
-                expect(sizeOut).toBe(outObj.testMarker.testSize);
+                expect(colOut).toBe(false);
+                expect(outObj.testMarker.testColor).toBe('rgba(0, 0, 0, 0)');
+                expect(sizeOut).toBe(false);
+                expect(outObj.testMarker.testSize).toBe(20);
             });
 
             it('should return false if there is no user input', function() {