mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-07 21:24:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: replace all master to main

Browse source
This commit is contained in:
Anh Hồng 2021-04-19 09:51:20 +07:00
parent 4148f0b846
commit b7ac2851c6
55 changed files with 431 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,7 @@ var LevelBuilder = Level.extend({
initGoalData: function() {
// add some default behavior in the beginning if we are not editing
if (!this.options.editLevel) {
this.level.goalTreeString = '{"branches":{"master":{"target":"C1","id":"master"},"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"}}';
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"}}';
this.level.solutionCommand = 'git checkout -b makeLevel; git commit';
}
LevelBuilder.__super__.initGoalData.apply(this, arguments);
@ -294,8 +294,8 @@ var LevelBuilder = Level.extend({
this.defineName();
}
var masterDeferred = Q.defer();
var chain = masterDeferred.promise;
var mainDeferred = Q.defer();
var chain = mainDeferred.promise;
if (this.level.hint === undefined) {
var askForHintDeferred = Q.defer();
@ -355,7 +355,7 @@ var LevelBuilder = Level.extend({
command.finishWith(deferred);
}.bind(this));
masterDeferred.resolve();
mainDeferred.resolve();
},
getExportObj: function() {

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

@ -197,10 +197,10 @@ var Level = Sandbox.extend({
},
initGoalVisualization: function() {
var onlyMaster = TreeCompare.onlyMasterCompared(this.level);
var onlyMain = TreeCompare.onlyMainCompared(this.level);
// first we make the goal visualization holder
this.goalCanvasHolder = new CanvasTerminalHolder({
text: (onlyMaster) ? intl.str('goal-only-main') : undefined,
text: (onlyMain) ? intl.str('goal-only-main') : undefined,
parent: this
});