mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 16:38:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to do --no-prompts

Browse source
This commit is contained in:
Peter Cottle 2025-05-20 11:23:52 +00:00
parent 17c6fff6c0
commit 1e887f3775
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/js/level/builder.js
View file

@ -81,8 +81,9 @@ var LevelBuilder = Level.extend({
initGoalData: function() { initGoalData: function() {
// add some default behavior in the beginning if we are not editing // add some default behavior in the beginning if we are not editing
if (!this.options.editLevel) { if (!this.options.editLevel) {
this.level.goalTreeString = '{"branches":{"main":{"target":"C1","id":"main"},"makeLevel":{"target":"C2","id":"makeLevel"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"makeLevel","id":"HEAD"}}'; // Trivial tree: single C0 commit, HEAD=main
this.level.solutionCommand = 'git checkout -b makeLevel; git commit'; this.level.goalTreeString = '{"branches":{"main":{"target":"C0","id":"main"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true}},"HEAD":{"target":"main","id":"HEAD"}}';
this.level.solutionCommand = '';
} }
LevelBuilder.__super__.initGoalData.apply(this, arguments); LevelBuilder.__super__.initGoalData.apply(this, arguments);
}, },
@ -292,13 +293,25 @@ var LevelBuilder = Level.extend({
return; return;
} }
while (!this.level.name) {
this.defineName();
}
var mainDeferred = Q.defer(); var mainDeferred = Q.defer();
var chain = mainDeferred.promise; var chain = mainDeferred.promise;
// If noPrompts is set, skip hint/startDialog prompts
if (this.options.noPrompts) {
if (this.level.hint === undefined) {
this.level.hint = {'en_US': ''};
}
if (this.startDialogObj === undefined) {
this.startDialogObj = null;
}
new MarkdownPresenter({
fillerText: JSON.stringify(this.getExportObj(), null, 2),
previewText: intl.str('share-json')
});
command.finishWith(deferred);
return;
}
if (this.level.hint === undefined) { if (this.level.hint === undefined) {
var askForHintDeferred = Q.defer(); var askForHintDeferred = Q.defer();
chain = chain.then(function() { chain = chain.then(function() {

2
src/js/sandbox/commands.js
View file

@ -184,7 +184,7 @@ var regexMap = {
'level': /^level\s?([a-zA-Z0-9]*)/, 'level': /^level\s?([a-zA-Z0-9]*)/,
'levels': /^levels($|\s)/, 'levels': /^levels($|\s)/,
'mobileAlert': /^mobile alert($|\s)/, 'mobileAlert': /^mobile alert($|\s)/,
'build level': /^build +level\s?([a-zA-Z0-9]*)( +--skipIntro)?$/, 'build level': /^build +level\s?([a-zA-Z0-9]*)( +--skipIntro)?( +--noPrompts)?$/,
'export tree': /^export +tree$/, 'export tree': /^export +tree$/,
'importTreeNow': /^importTreeNow($|\s)/, 'importTreeNow': /^importTreeNow($|\s)/,
'importLevelNow': /^importLevelNow($|\s)/, 'importLevelNow': /^importLevelNow($|\s)/,

4
src/js/sandbox/index.js
View file

@ -208,10 +208,12 @@ var Sandbox = Backbone.View.extend({
var regexResults = command.get('regexResults') || []; var regexResults = command.get('regexResults') || [];
var toEdit = regexResults[1] || false; var toEdit = regexResults[1] || false;
const rawStr = command.attributes.rawStr;
this.levelBuilder = new LevelBuilder({ this.levelBuilder = new LevelBuilder({
deferred: whenBuilderOpen, deferred: whenBuilderOpen,
editLevel: toEdit, editLevel: toEdit,
skipIntro: command.attributes.rawStr.indexOf('skipIntro') !== -1, skipIntro: rawStr.indexOf('skipIntro') !== -1,
noPrompts: rawStr.indexOf('noPrompts') !== -1,
}); });
whenBuilderOpen.promise.then(function() { whenBuilderOpen.promise.then(function() {
command.finishWith(deferred); command.finishWith(deferred);