Commit 3b26232

author

Michelle Tilley

committed

Initial attempt at undo/redo

1 parent 3ce880d commit 3b26232Copy full SHA for 3b26232

File tree

2 files changed

+75

-1

lines changed

js
- controlbox.js
- historyview.js

2 files changed

+75

-1

lines changed

`‎js/controlbox.js‎`

Lines changed: 37 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,13 @@ function(_yargs) {`
`25`	`25`	`this._currentCommand = -1;`
`26`	`26`	`this._tempCommand = '';`
`27`	`27`	`this.rebaseConfig = {}; // to configure branches for rebase`
	`28`	`+`
	`29`	`+ this.undoStacks = {`
	`30`	`+ hv: [this.historyView.serialize()]`
	`31`	`+ }`
	`32`	`+ this.undoPointers = {`
	`33`	`+ hv: 0`
	`34`	`+ }`
`28`	`35`	`}`
`29`	`36`
`30`	`37`	`ControlBox.prototype = {`
`@@ -117,6 +124,30 @@ function(_yargs) {`
`117`	`124`	`return;`
`118`	`125`	`}`
`119`	`126`
	`127`	`+ if (entry.trim() === 'undo') {`
	`128`	`+ var lastId = this.undoPointers.hv - 1`
	`129`	`+ var lastState = this.undoStacks.hv[lastId]`
	`130`	`+ if (lastState) {`
	`131`	`+ this.historyView.deserialize(lastState)`
	`132`	`+ this.undoPointers.hv = lastId`
	`133`	`+ } else {`
	`134`	`+ this.error("Nothing to undo")`
	`135`	`+ }`
	`136`	`+ return`
	`137`	`+ }`
	`138`	`+`
	`139`	`+ if (entry.trim() === 'redo') {`
	`140`	`+ var lastId = this.undoPointers.hv + 1`
	`141`	`+ var lastState = this.undoStacks.hv[lastId]`
	`142`	`+ if (lastState) {`
	`143`	`+ this.historyView.deserialize(lastState)`
	`144`	`+ this.undoPointers.hv = lastId`
	`145`	`+ } else {`
	`146`	`+ this.error("Nothing to redo")`
	`147`	`+ }`
	`148`	`+ return`
	`149`	`+ }`
	`150`	`+`
`120`	`151`	`var split = entry.split(' ');`
`121`	`152`
`122`	`153`	`this.terminalOutput.append('div')`
`@@ -137,7 +168,13 @@ function(_yargs) {`
`137`	`168`
`138`	`169`	`try {`
`139`	`170`	`if (typeof this[method] === 'function') {`
	`171`	`+`
`140`	`172`	`this[method](args, options, argsStr);`
	`173`	`+`
	`174`	`+ var state = this.historyView.serialize()`
	`175`	`+ this.undoPointers.hv++`
	`176`	`+ this.undoStacks.hv.length = this.undoPointers.hv`
	`177`	`+ this.undoStacks.hv.push(state)`
`141`	`178`	`} else {`
`142`	`179`	`this.error();`
`143`	`180`	`}`

`‎js/historyview.js‎`

Lines changed: 38 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,27 @@ define(['d3'], function() {`
`277`	`277`	`};`
`278`	`278`
`279`	`279`	`HistoryView.prototype = {`
	`280`	`+ serialize: function () {`
	`281`	`+ var data = {`
	`282`	`+ commitData: this.commitData,`
	`283`	`+ branches: this.branches,`
	`284`	`+ logs: this.logs,`
	`285`	`+ currentBranch: this.currentBranch,`
	`286`	`+ }`
	`287`	`+`
	`288`	`+ return JSON.stringify(data)`
	`289`	`+ },`
	`290`	`+`
	`291`	`+ deserialize: function (data) {`
	`292`	`+ data = JSON.parse(data)`
	`293`	`+ this.commitData = data.commitData`
	`294`	`+ this.branches = data.branches`
	`295`	`+ this.logs = data.logs`
	`296`	`+ this.currentBranch = data.currentBranch`
	`297`	`+ this.renderCommits()`
	`298`	`+ this.renderTags()`
	`299`	`+ },`
	`300`	`+`
`280`	`301`	`/**`
`281`	`302`	`* @method getCommit`
`282`	`303`	`* @param ref {String} the id or a tag name that refers to the commit`
`@@ -581,7 +602,10 @@ define(['d3'], function() {`
`581`	`602`	`.attr('r', 1)`
`582`	`603`	`.transition("inflate")`
`583`	`604`	`.duration(500)`
`584`		`- .attr('r', this.commitRadius);`
	`605`	`+ .attr('r', this.commitRadius)`
	`606`	`+`
	`607`	`+ existingCircles.exit()`
	`608`	`+ .remove()`
`585`	`609`
`586`	`610`	`},`
`587`	`611`
`@@ -620,6 +644,9 @@ define(['d3'], function() {`
`620`	`644`	`.transition()`
`621`	`645`	`.duration(500)`
`622`	`646`	`.call(fixPointerEndPosition, view);`
	`647`	`+`
	`648`	`+ existingPointers.exit()`
	`649`	`+ .remove()`
`623`	`650`	`},`
`624`	`651`
`625`	`652`	`_renderMergePointers: function() {`
`@@ -674,6 +701,9 @@ define(['d3'], function() {`
`674`	`701`	`points[1] = x2 + ',' + y2;`
`675`	`702`	`return points.join(' ');`
`676`	`703`	`});`
	`704`	`+`
	`705`	`+ existingPointers.exit()`
	`706`	`+ .remove()`
`677`	`707`	`},`
`678`	`708`
`679`	`709`	`_renderIdLabels: function() {`
`@@ -703,6 +733,9 @@ define(['d3'], function() {`
`703`	`733`	`.classed(className, true)`
`704`	`734`	`.text(getText)`
`705`	`735`	`.call(fixIdPosition, view, delta);`
	`736`	`+`
	`737`	`+ existingTexts.exit()`
	`738`	`+ .remove()`
`706`	`739`	`},`
`707`	`740`
`708`	`741`	`_parseTagData: function() {`
`@@ -857,6 +890,9 @@ define(['d3'], function() {`
`857`	`890`	`return commit.cx;`
`858`	`891`	`});`
`859`	`892`
	`893`	`+ existingTags.exit()`
	`894`	`+ .remove()`
	`895`	`+`
`860`	`896`	`this._markBranchlessCommits();`
`861`	`897`	`},`
`862`	`898`
`@@ -1363,6 +1399,7 @@ define(['d3'], function() {`
`1363`	`1399`	`if (origBranch) {`
`1364`	`1400`	`this.moveTag(origBranch, newHeadCommit.id)`
`1365`	`1401`	`this.reset(origBranch)`
	`1402`	`+ this._setCurrentBranch(origBranch)`
`1366`	`1403`	`this.addReflogEntry(`
`1367`	`1404`	`'HEAD', targetCommit.id, 'rebase finished: returning to resf/heads/' + origBranch`
`1368`	`1405`	`)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3b26232

File tree

2 files changed

2 files changed

`‎js/controlbox.js‎`

`‎js/historyview.js‎`

0 commit comments