pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Less repetitious code

Browse source
This commit is contained in:
Gina Häußge 2015-09-28 18:24:56 +02:00
parent 73c235d67f
commit e57ed92294
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -389,14 +389,17 @@ $(function() {
self.requestData = function(local) {
// handle old parameter format
var callback = undefined;
if (_.isFunction(local)) {
log.warn("The callback parameter of SettingsViewModel.requestData is deprecated, the method now returns a promise, please use that instead.");
callback = local;
local = false;
} else if (arguments.length == 2) {
log.warn("The callback parameter of SettingsViewModel.requestData is deprecated, the method now returns a promise, please use that instead.");
callback = arguments[0];
local = arguments[1];
if (arguments.length == 2 || _.isFunction(local)) {
var exc = new Error();
log.warn("The callback parameter of SettingsViewModel.requestData is deprecated, the method now returns a promise, please use that instead. Stacktrace:", (exc.stack || exc.stacktrace || "<n/a>"));
if (arguments.length == 2) {
callback = arguments[0];
local = arguments[1];
} else {
callback = local;
local = false;
}
}
// handler for any explicitely provided callbacks
@ -405,7 +408,7 @@ $(function() {
try {
callback();
} catch (exc) {
log.error("Error calling settings callback", callback, ":", (exc.stack || exc));
log.error("Error calling settings callback", callback, ":", (exc.stack || exc.stacktrace || exc));
}
};