diff --git a/src/lib/loggers.js b/src/lib/loggers.js index 56a1c863a8f..e6bb04224c9 100644 --- a/src/lib/loggers.js +++ b/src/lib/loggers.js @@ -33,7 +33,7 @@ loggers.log = function() { apply(console.trace || console.log, messages); } - if(dfltConfig.onGraphLogging > 1) { + if(dfltConfig.notifyOnLogging > 1) { var lines = []; for(i = 0; i < arguments.length; i++) { lines.push(arguments[i]); @@ -53,7 +53,7 @@ loggers.warn = function() { apply(console.trace || console.log, messages); } - if(dfltConfig.onGraphLogging > 0) { + if(dfltConfig.notifyOnLogging > 0) { var lines = []; for(i = 0; i < arguments.length; i++) { lines.push(arguments[i]); @@ -73,7 +73,7 @@ loggers.error = function() { apply(console.error, messages); } - if(dfltConfig.onGraphLogging > 0) { + if(dfltConfig.notifyOnLogging > 0) { var lines = []; for(i = 0; i < arguments.length; i++) { lines.push(arguments[i]); diff --git a/src/plot_api/plot_config.js b/src/plot_api/plot_config.js index 309e0c708ce..87c3d8e4ad7 100644 --- a/src/plot_api/plot_config.js +++ b/src/plot_api/plot_config.js @@ -390,7 +390,7 @@ var configAttributes = { ].join(' ') }, - onGraphLogging: { + notifyOnLogging: { valType: 'integer', min: 0, max: 2, diff --git a/test/jasmine/tests/lib_test.js b/test/jasmine/tests/lib_test.js index d855b331ded..34d5d2c43a6 100644 --- a/test/jasmine/tests/lib_test.js +++ b/test/jasmine/tests/lib_test.js @@ -1704,13 +1704,13 @@ describe('Test lib.js:', function() { beforeEach(function() { stashConsole = window.console; stashLogLevel = config.logging; - stashOnGraphLogLevel = config.onGraphLogging; + stashOnGraphLogLevel = config.notifyOnLogging; }); afterEach(function() { window.console = stashConsole; config.logging = stashLogLevel; - config.onGraphLogging = stashOnGraphLogLevel; + config.notifyOnLogging = stashOnGraphLogLevel; }); it('emits one console message if apply is available', function() { @@ -1811,7 +1811,7 @@ describe('Test lib.js:', function() { ]); }); - describe('should log message in notifier div in accordance onGraphLogging config option', function() { + describe('should log message in notifier div in accordance notifyOnLogging config option', function() { var query = '.notifier-note'; beforeEach(function(done) { @@ -1840,17 +1840,17 @@ describe('Test lib.js:', function() { } it('with level 2', function() { - config.onGraphLogging = 2; + config.notifyOnLogging = 2; _run(['log', 'warn', 'error!']); }); it('with level 1', function() { - config.onGraphLogging = 1; + config.notifyOnLogging = 1; _run(['warn', 'error!']); }); it('with level 0', function() { - config.onGraphLogging = 0; + config.notifyOnLogging = 0; _run([]); }); });