Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] MacOS dmg build #597

Merged
merged 2 commits into from
Nov 9, 2017
Merged

[FIX] MacOS dmg build #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa67bd5
Attempt to fix mac build
alexbrazier Nov 9, 2017
52f21b4
Fix window state issue
alexbrazier Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ branches:
only:
- master
- develop
- hotfix

notifications:
email:
Expand Down
0 build/entitlements.mac.inherit.plist → build/entitlements.mas.inherit.plist
View file
Open in desktop
File renamed without changes.
0 build/entitlements.mac.plist → build/entitlements.mas.plist
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "rocketchat",
"productName": "Rocket.Chat+",
"description": "Rocket.Chat Native Cross-Platform Desktop Application via Electron.",
"version": "2.10.0",
"version": "2.10.1",
"author": "Rocket.Chat Support <[email protected]>",
"copyright": "© 2017, Rocket.Chat",
"homepage": "https://rocket.chat",
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: rocketchat-desktop
version: 2.10.0
version: 2.10.1
summary: Rocket.Chat+
description: Rocket.Chat Native Cross-Platform Desktop Application via Electron.
confinement: strict
Expand Down
10 changes: 5 additions & 5 deletions src/background/windowState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function (name, defaults) {

try {
const loadedState = userDataDir.read(stateStoreFile, 'json');
if (loadedState != null) {
if (loadedState) {
state = loadedState;
}
} catch (err) {
Expand All @@ -41,10 +41,10 @@ export default function (name, defaults) {
};

return {
get x () { return Math.floor(state.x); },
get y () { return Math.floor(state.y); },
get width () { return Math.floor(state.width); },
get height () { return Math.floor(state.height); },
get x () { return state.x && Math.floor(state.x); },
get y () { return state.y && Math.floor(state.y); },
get width () { return state.width && Math.floor(state.width); },
get height () { return state.height && Math.floor(state.height); },
get isMaximized () { return state.isMaximized; },
get isMinimized () { return state.isMinimized; },
get isHidden () { return state.isHidden; },
Expand Down