From 455174e54150178271311bc83351136d464d1a1e Mon Sep 17 00:00:00 2001 From: codingtwinky Date: Fri, 24 Feb 2017 18:18:34 -0800 Subject: [PATCH 1/3] Fix load more rendering --- components/textdiff/textdiff.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/textdiff/textdiff.js b/components/textdiff/textdiff.js index 38e9ccf7c..e51737a4a 100644 --- a/components/textdiff/textdiff.js +++ b/components/textdiff/textdiff.js @@ -194,7 +194,7 @@ TextDiffViewModel.prototype.render = function(isInvalidate) { TextDiffViewModel.prototype.loadMore = function() { this.loadCount += this.loadMoreCount(); - this.render(); + programEvents.dispatch({ event: 'invalidate-diff-and-render' }); } TextDiffViewModel.prototype.getPatchCheckBox = function(symbol, index, isActive) { From 5855a269532daf231033b423f18d6ba10f0f05ac Mon Sep 17 00:00:00 2001 From: codingtwinky Date: Fri, 24 Feb 2017 18:24:27 -0800 Subject: [PATCH 2/3] On patch commit, reset edit state to none --- components/staging/staging.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/staging/staging.js b/components/staging/staging.js index f95050957..d759b4545 100644 --- a/components/staging/staging.js +++ b/components/staging/staging.js @@ -226,6 +226,7 @@ StagingViewModel.prototype.resetMessages = function() { element.diff().invalidateDiff(); element.patchLineList.removeAll(); element.isShowingDiffs(false); + element.editState(element.editState() === 'patched' ? 'none' : element.editState()) } this.amend(false); } From 1719e300731725313eb787a45464d14beb9ccb9f Mon Sep 17 00:00:00 2001 From: codingtwinky Date: Fri, 24 Feb 2017 18:27:10 -0800 Subject: [PATCH 3/3] Cut new version --- CHANGELOG.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29ace2dc2..06cbde2e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Use the following format for additions: ` - VERSION: [feature/patch (if applicab - 1.1.8: - Realtime text diff via invalidate diff on directory change [#867](https://github.com/FredrikNoren/ungit/pull/867) - Promisify `./source/utils/cache.js` [#870](https://github.com/FredrikNoren/ungit/pull/870) + - Fix load more text diff button. [#876](https://github.com/FredrikNoren/ungit/pull/876) - 1.1.7: - Fix diff flickering issue and optimization [#865](https://github.com/FredrikNoren/ungit/pull/865) - Fix credential dialog issue [#864](https://github.com/FredrikNoren/ungit/pull/864) diff --git a/package.json b/package.json index 82b33e36f..7aa6d41bf 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ungit", "author": "Fredrik Norén ", "description": "Git made easy", - "version": "1.1.7", + "version": "1.1.8", "ungitPluginApiVersion": "0.2.0", "scripts": { "start": "node ./bin/ungit",