Merge pull request RocketChat#147 from RocketChat/develop

Version 1.2.0
HappyTobi · Mar 21, 2016 · c4d41d6 · c4d41d6
2 parents fe90b38 + f74b825
commit c4d41d6
Show file tree

Hide file tree

Showing 31 changed files with 163,054 additions and 637 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-electron-boilerplate
+Rocket.Chat.Electron
 ==============
 Comprehensive boilerplate application for [Electron runtime](http://electron.atom.io).
 

diff --git a/app/about.html b/app/about.html
@@ -0,0 +1,51 @@
+<!doctype html>
+<html>
+<head>
+	<title></title>
+	<meta charset="utf-8" />
+	<style>
+		html {
+			background-color: #ececec;
+			font-family: helvetica;
+			text-align: center;
+			padding: 10px;
+		}
+
+		body {
+			margin: 0px;
+		}
+
+		img {
+			height: 60px;
+			margin-bottom: 10px;
+		}
+
+		.app-name {
+			font-size: 14px;
+			font-weight: bold;
+		}
+
+		.app-version {
+			font-size: 11px;
+			position: fixed;
+			bottom: 30px;
+			left: 0;
+			right: 0;
+		}
+	</style>
+</head>
+	<body>
+		<img src="images/icon.png">
+		<div class="app-name">
+
+		</div>
+		<div class="app-version">
+
+		</div>
+		<script>
+			var remote = require('remote');
+			document.querySelector('.app-name').innerHTML = remote.app.getName();
+			document.querySelector('.app-version').innerHTML = 'Version '+remote.app.getVersion();
+		</script>
+	</body>
+</html>
diff --git a/app/app.html b/app/app.html
@@ -6,7 +6,7 @@
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-	<link rel="stylesheet" type="text/css" href="./stylesheets/base.css">
+	<link rel="stylesheet" type="text/css" href="./stylesheets/main.css">
 	<link rel="stylesheet" type="text/css" href="./stylesheets/start-page.css">
 	<link rel="stylesheet" type="text/css" href="./branding/branding.css">
 	<script type="text/javascript" src="lib/bugsnag.js"></script>

diff --git a/app/background.js b/app/background.js
@@ -13,6 +13,21 @@ import env from './env';
 
 var mainWindow;
 
+if (process.platform !== 'darwin') {
+    var shouldQuit = app.makeSingleInstance(function() {
+        // Someone tried to run a second instance, we should focus our window.
+        if (mainWindow) {
+            mainWindow.restore();
+            mainWindow.show();
+            mainWindow.focus();
+        }
+    });
+
+    if (shouldQuit) {
+        app.quit();
+    }
+}
+
 // Preserver of the window size and position between app launches.
 var mainWindowState = windowStateKeeper('main', {
     width: 1000,
@@ -32,6 +47,14 @@ app.on('ready', function () {
         mainWindow.maximize();
     }
 
+    if (mainWindowState.isMinimized) {
+        mainWindow.minimize();
+    }
+
+    if (mainWindowState.isHidden) {
+        mainWindow.hide();
+    }
+
     if (env.name === 'test') {
         mainWindow.loadURL('file://' + __dirname + '/spec.html');
     } else {
@@ -43,8 +66,21 @@ app.on('ready', function () {
         mainWindow.openDevTools();
     }
 
-    mainWindow.on('close', function () {
+    mainWindow.on('close', function (event) {
         mainWindowState.saveState(mainWindow);
+        if (mainWindow.forceClose) {
+            return;
+        }
+        event.preventDefault();
+        mainWindow.hide();
+    });
+
+    app.on('before-quit', function() {
+        mainWindow.forceClose = true;
+    });
+
+    app.on('activate', function(){
+        mainWindow.show();
     });
 
     mainWindow.webContents.on('will-navigate', function(event) {

diff --git a/app/package.json b/app/package.json
@@ -1,10 +1,10 @@
 {
   "name": "rocketchat",
-  "productName": "Rocket.Chat",
+  "productName": "Rocket.Chat+",
   "identifier": "chat.rocket",
   "description": "Rocket.Chat Native Cross-Platform Desktop Application via Electron.",
-  "version": "1.1.0",
-  "build": "10",
+  "version": "1.2.0",
+  "build": "13",
   "author": "Rocket.Chat Support <[email protected]>",
   "copyright": "© 2016, Rocket.Chat",
   "main": "background.js",

diff --git a/app/scripts/config.js b/app/scripts/config.js