rewrite plot_config as valObjects

- and rewrite setPlotConfig + setPlotContext

Author: etpinard

src/lib/loggers.js

@@ -11,6 +11,7 @@
 /* eslint-disable no-console */
 
 var config = require('../plot_api/plot_config');
+var loggingDflt = config.dflt;
 
 var loggers = module.exports = {};
 
@@ -21,7 +22,7 @@ var loggers = module.exports = {};
  */
 
 loggers.log = function() {
-    if(config.logging > 1) {
+    if(loggingDflt > 1) {
         var messages = ['LOG:'];
 
         for(var i = 0; i < arguments.length; i++) {
@@ -37,7 +38,7 @@ loggers.log = function() {
 };
 
 loggers.warn = function() {
-    if(config.logging > 0) {
+    if(loggingDflt > 0) {
         var messages = ['WARN:'];
 
         for(var i = 0; i < arguments.length; i++) {
@@ -53,7 +54,7 @@ loggers.warn = function() {
 };
 
 loggers.error = function() {
-    if(config.logging > 0) {
+    if(loggingDflt > 0) {
         var messages = ['ERROR:'];
 
         for(var i = 0; i < arguments.length; i++) {

src/plot_api/plot_api.js

@@ -28,6 +28,7 @@ var ErrorBars = require('../components/errorbars');
 var xmlnsNamespaces = require('../constants/xmlns_namespaces');
 var svgTextUtils = require('../lib/svg_text_utils');
 
+var defaultConfig = require('./plot_config');
 var helpers = require('./helpers');
 var subroutines = require('./subroutines');
 
@@ -80,6 +81,7 @@ Plotly.plot = function(gd, data, layout, config) {
 
     // transfer configuration options to gd until we move over to
     // a more OO like model
+
     setPlotContext(gd, config);
 
     if(!layout) layout = {};
@@ -363,32 +365,49 @@ Plotly.plot = function(gd, data, layout, config) {
     });
 };
 
-
 function opaqueSetBackground(gd, bgColor) {
     gd._fullLayout._paperdiv.style('background', 'white');
-    Plotly.defaultConfig.setBackground(gd, bgColor);
+    defaultConfig.setBackground.dflt(gd, bgColor);
 }
 
 function setPlotContext(gd, config) {
-    if(!gd._context) gd._context = Lib.extendFlat({}, Plotly.defaultConfig);
-    var context = gd._context;
+    var keys, i;
 
-    if(config) {
-        Object.keys(config).forEach(function(key) {
-            if(key in context) {
-                if(key === 'setBackground' && config[key] === 'opaque') {
-                    context[key] = opaqueSetBackground;
-                }
-                else context[key] = config[key];
-            }
-        });
+    if(!gd._context) {
+        gd._context = {};
+        keys = Object.keys(defaultConfig);
 
-        // map plot3dPixelRatio to plotGlPixelRatio for backward compatibility
-        if(config.plot3dPixelRatio && !context.plotGlPixelRatio) {
-            context.plotGlPixelRatio = context.plot3dPixelRatio;
+        // init context
+        for(i = 0; i < keys.length; i++) {
+            var k = keys[i];
+            gd._context[k] = defaultConfig[k].dflt;
         }
     }
 
+    var context = gd._context;
+
+    config = Lib.isPlainObject(config) ? config : {};
+    keys = Object.keys(config);
+
+    function coerce(key, dflt) {
+        return Lib.coerce(config, context, defaultConfig, key, dflt);
+    }
+
+    // extend context with config
+    for(i = 0; i < keys.length; i++) {
+        coerce(keys[i]);
+    }
+
+    // 'opaque' is special value for setBackground
+    if(config.setBackground === 'opaque') {
+        context.setBackground = opaqueSetBackground;
+    }
+
+    // map plot3dPixelRatio to plotGlPixelRatio for backward compatibility
+    if(config.plot3dPixelRatio && !context.plotGlPixelRatio) {
+        context.plotGlPixelRatio = context.plot3dPixelRatio;
+    }
+
     // staticPlot forces a bunch of others:
     if(context.staticPlot) {
         context.editable = false;