use flaglist with non-string extra parameters

Author: nickmelnikov82

src/lib/coerce.js

@@ -215,14 +215,14 @@ exports.valObjectMeta = {
         requiredOpts: ['flags'],
         otherOpts: ['dflt', 'extras', 'arrayOk'],
         coerceFunction: function(v, propOut, dflt, opts) {
-            if(typeof v !== 'string') {
-                propOut.set(dflt);
-                return;
-            }
             if((opts.extras || []).indexOf(v) !== -1) {
                 propOut.set(v);
                 return;
             }
+            if(typeof v !== 'string') {
+                propOut.set(dflt);
+                return;
+            }
             var vParts = v.split('+');
             var i = 0;
             while(i < vParts.length) {

src/plots/cartesian/layout_attributes.js

@@ -625,14 +625,9 @@ module.exports = {
         description: 'Determines whether or not the tick labels are drawn.'
     },
     automargin: {
-        valType: 'enumerated',
-        values: [
-            true, false, 'height', 'width',
-            'top', 'bottom', 'left', 'right',
-            'top left', 'top width', 'top right',
-            'left height', 'right height',
-            'bottom left', 'bottom width', 'bottom right',
-        ],
+        valType: 'flaglist',
+        flags: ['height', 'width', 'left', 'right', 'top', 'bottom'],
+        extras: [true, false],
         dflt: false,
         editType: 'ticks',
         description: [

test/jasmine/tests/axes_test.js

@@ -4284,15 +4284,15 @@ describe('Test axes', function() {
                 t: 'grew', l: 'grew',
                 b: '=', r: '='
             }))
-            .then(check('automargin not left', {'yaxis.automargin': 'right height'}, {
+            .then(check('automargin not left', {'yaxis.automargin': 'right+height'}, {
                 t: 'grew', l: '=',
                 b: '=', r: '='
             }))
-            .then(check('automargin keep left height', {'yaxis.automargin': 'left height'}, {
+            .then(check('automargin keep left height', {'yaxis.automargin': 'left+height'}, {
                 t: 'grew', l: 'grew',
                 b: '=', r: '='
             }))
-            .then(check('automargin keep bottom right', {'yaxis.automargin': 'bottom right'}, {
+            .then(check('automargin keep bottom right', {'yaxis.automargin': 'bottom+right'}, {
                 t: '=', l: '=',
                 b: '=', r: '='
             }))
@@ -4304,7 +4304,7 @@ describe('Test axes', function() {
                 t: 'grew', l: '=',
                 b: '=', r: '='
             }))
-            .then(check('automargin not top', {'yaxis.automargin': 'bottom width'}, {
+            .then(check('automargin not top', {'yaxis.automargin': 'bottom+width'}, {
                 t: '=', l: 'grew',
                 b: '=', r: '='
             }))
@@ -4320,7 +4320,7 @@ describe('Test axes', function() {
                 t: '=', l: '=',
                 b: 'grew', r: 'grew'
             }))
-            .then(check('automargin not bottom', {'xaxis.automargin': 'top width'}, {
+            .then(check('automargin not bottom', {'xaxis.automargin': 'top+width'}, {
                 t: '=', l: '=',
                 b: '=', r: 'grew'
             }))
@@ -4332,15 +4332,15 @@ describe('Test axes', function() {
                 t: '=', l: '=',
                 b: 'grew', r: '='
             }))
-            .then(check('automargin keep top right', {'xaxis.automargin': 'top right'}, {
+            .then(check('automargin keep top right', {'xaxis.automargin': 'top+right'}, {
                 t: '=', l: '=',
                 b: '=', r: 'grew'
             }))
-            .then(check('automargin keep top left', {'xaxis.automargin': 'top left'}, {
+            .then(check('automargin keep top left', {'xaxis.automargin': 'top+left'}, {
                 t: '=', l: '=',
                 b: '=', r: '='
             }))
-            .then(check('automargin keep bottom left', {'xaxis.automargin': 'bottom left'}, {
+            .then(check('automargin keep bottom left', {'xaxis.automargin': 'bottom+left'}, {
                 t: '=', l: '=',
                 b: 'grew', r: '='
             }))