Merge branch 'release/2.13.2'

RocketChat · Sep 10, 2018 · 8ba1bd0 · 8ba1bd0
2 parents 640e4f9 + 65f7c03
commit 8ba1bd0
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 53 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,14 @@
+<a name="2.13.2"></a>
+## 2.13.2 (2018-09-10)
+
+
+### Bug Fixes
+- Dependencies updated
+- Window state persistency triggering redefined
+- AppId for Windows setups recovered
+- Linux package names fixed
+- Fixed multiple issues in provisioning profiles and entitlements for MacOS builds
+
 <a name="2.13.1"></a>
 ## 2.13.1 (2018-08-30)
 

diff --git a/build/installer.nsh b/build/installer.nsh
@@ -20,6 +20,13 @@
   !define MUI_FINISHPAGE_SHOWREADME_FUNCTION un.AddAppData
 !endif
 
+!macro customInstall
+  ; Remove dangling references of versions 2.13.0 and 2.13.1
+  SetRegView 64
+  DeleteRegKey HKLM "Software\9b73a9fb-f1d5-59ee-b41e-e1dd393a748a"
+  Delete "$SMSTARTUP\Rocket.Chat+.lnk"
+!macroend
+
 !macro customUnInstall
   ${IfNot} ${Silent}
     Delete "$SMSTARTUP\Rocket.Chat.lnk"

diff --git a/embedded.provisionprofile b/embedded.provisionprofile
diff --git a/snap/gui/icon.png b/snap/gui/icon.png
diff --git a/snap/gui/rocketchat-desktop.desktop b/snap/gui/rocketchat-desktop.desktop
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
diff --git a/src/background/mainWindow.js b/src/background/mainWindow.js
@@ -6,6 +6,7 @@
 import { app, BrowserWindow, ipcMain, nativeImage } from 'electron';
 import url from 'url';
 import path from 'path';
+import { debounce } from 'lodash';
 
 import windowStateKeeper from './windowState';
 import env from '../env';
@@ -58,13 +59,13 @@ const attachWindowStateHandling = (mainWindow) => {
         mainWindowState.saveState(mainWindow);
     });
 
-    mainWindow.on('resize', function () {
+    mainWindow.on('resize', debounce(() => {
         mainWindowState.saveState(mainWindow);
-    });
+    }), 1000);
 
-    mainWindow.on('move', function () {
+    mainWindow.on('move', debounce(() => {
         mainWindowState.saveState(mainWindow);
-    });
+    }), 1000);
 };
 
 const attachIpcMessageHandling = (mainWindow) => {

diff --git a/src/background/windowState.js b/src/background/windowState.js
@@ -4,7 +4,6 @@
 
 import { app } from 'electron';
 import jetpack from 'fs-jetpack';
-import { debounce } from 'lodash';
 
 export default function (name, defaults) {
 
@@ -62,7 +61,7 @@ export default function (name, defaults) {
         get isMaximized () { return state.isMaximized; },
         get isMinimized () { return state.isMinimized; },
         get isHidden () { return state.isHidden; },
-        saveState: debounce(saveState, 1000),
+        saveState,
         loadState
     };
 }