mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-29 22:29:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #567 from Hongarc/trim

Browse source 
Trim
This commit is contained in:
Peter Cottle 2019-04-21 18:53:46 -07:00 • committed by GitHub
commit e92fe2c45e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 877 additions and 884 deletions
Download patch file Download diff file Expand all files Collapse all files

1674
assets/emoji_table.rtf
View file

File diff suppressed because it is too large Load diff

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

@ -37,7 +37,7 @@ var commands = {
// copy command, and then set opts
commandObj.setOptionsMap(delConfig.options || {});
commandObj.setGeneralArgs(delConfig.args || []);
commandConfigs[delConfig.vcs][delConfig.name].execute.call(this, engine, commandObj);
}, this);
} else {

2
src/js/intl/index.js
View file

@ -107,7 +107,7 @@ exports.getStartDialog = function(level) {
}
};
var startCopy = Object.assign(
{},
{},
level.startDialog[getDefaultLocale()] || level.startDialog
);
startCopy.childViews.unshift(errorAlert);

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

@ -206,7 +206,7 @@ var commandConfig = {
};
}
},
backout: {
regex: /^hg +backout($|\s+)/,
options: [

2
src/js/models/commandModel.js
View file

@ -76,7 +76,7 @@ var Command = Backbone.Model.extend({
mapDotToHead: function() {
var generalArgs = this.getGeneralArgs();
var options = this.getOptionsMap();
generalArgs = generalArgs.map(function(arg) {
return this.replaceDotWithHead(arg);
}, this);

2
src/js/react_views/LevelToolbarView.jsx
View file

@ -60,7 +60,7 @@ var LevelToolbarView = React.createClass({
<button
onClick={this.props.onGoalClick}
type="button">
{this.state.isGoalExpanded ?
{this.state.isGoalExpanded ?
intl.str('hide-goal-button') :
intl.str('show-goal-button')
}

4
src/js/stores/CommandLineStore.js
View file

@ -4,8 +4,6 @@ var AppConstants = require('../constants/AppConstants');
var AppDispatcher = require('../dispatcher/AppDispatcher');
var EventEmitter = require('events').EventEmitter;
var assign = require('object-assign');
var ActionTypes = AppConstants.ActionTypes;
var COMMAND_HISTORY_KEY = 'lgb_CommandHistory';
var COMMAND_HISTORY_MAX_LENGTH = 100;
@ -38,7 +36,7 @@ function _saveToLocalStorage() {
}
}
var CommandLineStore = assign(
var CommandLineStore = Object.assign(
{},
EventEmitter.prototype,
AppConstants.StoreSubscribePrototype,

4
src/js/stores/GlobalStateStore.js
View file

@ -4,15 +4,13 @@ var AppConstants = require('../constants/AppConstants');
var AppDispatcher = require('../dispatcher/AppDispatcher');
var EventEmitter = require('events').EventEmitter;
var assign = require('object-assign');
var ActionTypes = AppConstants.ActionTypes;
var _isAnimating = false;
var _flipTreeY = false;
var _numLevelsSolved = 0;
var GlobalStateStore = assign(
var GlobalStateStore = Object.assign(
{},
EventEmitter.prototype,
AppConstants.StoreSubscribePrototype,

5
src/js/stores/LevelStore.js
View file

@ -3,7 +3,6 @@
var AppConstants = require('../constants/AppConstants');
var AppDispatcher = require('../dispatcher/AppDispatcher');
var EventEmitter = require('events').EventEmitter;
var assign = require('object-assign');
var levelSequences = require('../../levels').levelSequences;
var sequenceInfo = require('../../levels').sequenceInfo;
@ -62,7 +61,7 @@ Object.keys(levelSequences).forEach(function(levelSequenceName) {
validateLevel(level);
var id = levelSequenceName + String(index + 1);
var compiledLevel = assign(
var compiledLevel = Object.assign(
{},
level,
{
@ -78,7 +77,7 @@ Object.keys(levelSequences).forEach(function(levelSequenceName) {
});
});
var LevelStore = assign(
var LevelStore = Object.assign(
{},
EventEmitter.prototype,
AppConstants.StoreSubscribePrototype,

8
src/js/stores/LocaleStore.js
View file

@ -4,8 +4,6 @@ var AppConstants = require('../constants/AppConstants');
var AppDispatcher = require('../dispatcher/AppDispatcher');
var EventEmitter = require('events').EventEmitter;
var assign = require('object-assign');
var ActionTypes = AppConstants.ActionTypes;
var DEFAULT_LOCALE = 'en_US';
@ -55,7 +53,7 @@ function _getLocaleFromHeader(langString) {
}
var _locale = DEFAULT_LOCALE;
var LocaleStore = assign(
var LocaleStore = Object.assign(
{},
EventEmitter.prototype,
AppConstants.StoreSubscribePrototype,
@ -66,11 +64,11 @@ AppConstants.StoreSubscribePrototype,
},
getLangLocaleMap: function() {
return assign({}, langLocaleMap);
return Object.assign({}, langLocaleMap);
},
getHeaderLocaleMap: function() {
return assign({}, headerLocaleMap);
return Object.assign({}, headerLocaleMap);
},
getLocale: function() {

2
src/js/util/constants.js
View file

@ -44,7 +44,7 @@ var GRAPHICS = {
tagFill: 'hsb(0,0,0.9)',
tagStroke: '#FFF',
tagStrokeWidth: '2',
orphanNodeFill: 'hsb(0.5,0.8,0.7)'
};

2
src/js/util/throttle.js
View file

@ -4,7 +4,7 @@ module.exports = function(func, time) {
if (!wait) {
func.apply(this, arguments);
wait = true;
setTimeout(function() {
wait = false;
}, time);

2
src/js/views/index.js
View file

@ -311,7 +311,7 @@ var ModalTerminal = ContainedBase.extend({
this.container = new ModalView();
this.JSON = {
title: options.title
title: options.title
};
this.render();

2
src/levels/mixed/tags.js
View file

@ -1,4 +1,4 @@
exports.level = {
exports.level = {
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C5\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"side\":{\"target\":\"C3\",\"id\":\"side\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C1\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C2\",\"C4\"],\"id\":\"C5\"}},\"tags\":{\"v1\":{\"target\":\"C2\",\"id\":\"v1\",\"type\":\"tag\"},\"v0\":{\"target\":\"C1\",\"id\":\"v0\",\"type\":\"tag\"}},\"HEAD\":{\"target\":\"C2\",\"id\":\"HEAD\"}}",
"solutionCommand": "git tag v1 side~1;git tag v0 master~2;git checkout v1",
"startTree": "{\"branches\":{\"master\":{\"target\":\"C5\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"side\":{\"target\":\"C3\",\"id\":\"side\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C1\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C2\",\"C4\"],\"id\":\"C5\"}},\"tags\":{},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",

2
src/levels/rampup/cherryPick.js
View file

@ -1,4 +1,4 @@
exports.level = {
exports.level = {
"goalTreeString": "%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22master%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22bugFix%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C5%22%2C%22id%22%3A%22side%22%7D%2C%22another%22%3A%7B%22target%22%3A%22C7%22%2C%22id%22%3A%22another%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C6%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C4%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",
"solutionCommand": "git cherry-pick C3 C4 C7",
"compareOnlyMasterHashAgnostic": true,

2
src/levels/rampup/interactiveRebase.js
View file

@ -1,4 +1,4 @@
exports.level = {
exports.level = {
"goalTreeString": "%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C4%27%22%2C%22id%22%3A%22master%22%7D%2C%22overHere%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22overHere%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C5%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C5%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",
"solutionCommand": "git rebase -i overHere --solution-ordering C3,C5,C4",
"compareOnlyMasterHashAgnostic": true,

2
src/levels/remote/fetchArgs.js
View file

@ -574,7 +574,7 @@ exports.level = {
"markdowns": [
"Poderás preguntarte \"¿Por qué git aplicou eses commits sobre a rama `origin/foo` e non os aplicou sobre a rama `foo` local? Lembra que o parámetro `<lugar>` era un lugar que existía tanto no local como no remoto.\"",
"",
"Bueno, git fai unha excepción especial neste caso, xa que poderías ter traballo na rama `foo` que non quixeras mesturar. Esto refírese á lección anterior sobre `git fetch` - non actualiza as túas ramas locais non-remotas, só descarga os commits (para que poidas velos ou mesturalos despois).",
"Bueno, git fai unha excepción especial neste caso, xa que poderías ter traballo na rama `foo` que non quixeras mesturar. Esto refírese á lección anterior sobre `git fetch` - non actualiza as túas ramas locais non-remotas, só descarga os commits (para que poidas velos ou mesturalos despois).",
""
]
}

2
src/levels/remote/pushArgs2.js
View file

@ -363,7 +363,7 @@ exports.level = {
"¿E qué hai se o destino ó que queres empurrar non existise? ¡Non pasa nada! Sinxelamente dalle un nome á rama e git vaise encargar de crealo no remoto."
],
"afterMarkdowns": [
"Xenial, sinxelamente tira para adiante"
"Xenial, sinxelamente tira para adiante"
],
"command": "git push origin master:newBranch",
"beforeCommand": "git clone; git commit"

2
src/levels/remote/tracking.js
View file

@ -563,7 +563,7 @@ exports.level = {
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"Suficiente charla, ¡vexamos unha demo! Imos facer checkout a unha nova rama chamada `foo` e facer que siga a `master` no remoto."
"Suficiente charla, ¡vexamos unha demo! Imos facer checkout a unha nova rama chamada `foo` e facer que siga a `master` no remoto."
],
"afterMarkdowns": [
"Como podes ver, empregamos o obxectivo implícito de merge `o/master` para actualizar a rama `foo`. ¡Nota como `master` non foi actualizada!"

36
src/style/rainbows.css
View file

@ -1,6 +1,6 @@
/*
* CSS animated rainbow dividers of awesome
* by Chris Heilmann @codepo8 and Lea Verou @leaverou
* CSS animated rainbow dividers of awesome
* by Chris Heilmann @codepo8 and Lea Verou @leaverou
**/
/**
@ -8,28 +8,28 @@
*/
@-moz-keyframes rainbowanim {
from { background-position:top left; }
from { background-position:top left; }
to {background-position:top right; }
}
@-webkit-keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
@-webkit-keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
}
@-o-keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
@-o-keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
}
@-ms-keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
@-ms-keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
}
@-khtml-keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
@-khtml-keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
}
@keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
@keyframes rainbowanim {
from { background-position:top left; }
to { background-position:top right; }
}
.catchadream{

2
src/template.index.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html lang="en">
<head>