Merge branch 'pcs' into staging

This commit is contained in:
yflory
2020-04-06 16:26:38 +02:00
5 changed files with 3 additions and 306 deletions

View File

@@ -402,12 +402,6 @@ define([
Thumb.initPadThumbnails(common, options.thumbnail);
}
}
var skipTemp = Util.find(privateDat, ['settings', 'general', 'creation', 'noTemplate']);
var skipCreation = Util.find(privateDat, ['settings', 'general', 'creation', 'skip']);
if (newPad && (!AppConfig.displayCreationScreen || (!skipTemp && skipCreation))) {
common.openTemplatePicker();
}
});
};
var onConnectionChange = function (info) {