Merge pull request #876 from codingtwinky/875

fix load more
FredrikNoren · Feb 25, 2017 · c137600 · c137600
2 parents 20d1c95 + 1719e30
commit c137600
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git 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/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);
 }

diff --git 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) {

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "ungit",
   "author": "Fredrik Norén <[email protected]>",
   "description": "Git made easy",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "ungitPluginApiVersion": "0.2.0",
   "scripts": {
     "start": "node ./bin/ungit",