From 561a93de8f659de0f8957d18ec52bd943b2e34d9 Mon Sep 17 00:00:00 2001 From: Jonas Schwabe Date: Fri, 9 Sep 2016 20:37:48 +0200 Subject: [PATCH] Revert "add chaneglog for forceReload PR" This reverts commit 58dfda760ea933d4708041c0dfe4b50de7b1ea21. Revert "Fix error handler which showed an error on reload, as the cancel event was triggered after the cacheInvalidated property has been set to true" This reverts commit 93263aea3a4160b7b0954f5e17e74dce5ba4b42d. Revert "Workaround for bad cache handling in mattermost platform, fixes #212" This reverts commit 61bf5344bfac076397a27503ee8153da5c9565fe. --- CHANGELOG.md | 1 - src/browser/index.jsx | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccb4f081..aea38639 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,6 @@ Release date: TBD - Changed display of unread messages on the team tabbar, they are now shown as bold text - Reload only the selected tab and keep its URL on "Reload" and "Clear Cache and Reload". - Disabled `eval()` function for security improvements. -- Invalidate cache before load, to make server upgrades easy - Removed misleading shortcuts from tray menu, as they didn't work - Ctrl/Command+F puts cursor in search box to search in current channel. - Add access to settings through tray menu diff --git a/src/browser/index.jsx b/src/browser/index.jsx index c7871cf9..a35fc5ef 100644 --- a/src/browser/index.jsx +++ b/src/browser/index.jsx @@ -324,8 +324,7 @@ var MattermostView = React.createClass({ webview.addEventListener('did-fail-load', function(e) { console.log(thisObj.props.name, 'webview did-fail-load', e); - if (e.errorCode === -3 || // An operation was aborted (due to user action). - e.errorCode === -300) { //The operation was aborted to invalidate application cache + if (e.errorCode === -3) { // An operation was aborted (due to user action). return; } @@ -360,13 +359,6 @@ var MattermostView = React.createClass({ } }); - webview.addEventListener("did-start-loading", function() { - if (!webview.cacheInvalidated) { - webview.reloadIgnoringCache(); - webview.cacheInvalidated = true; - } - }); - webview.addEventListener("dom-ready", function() { // webview.openDevTools();