Merge branch 'master' into develop

christianpatrick · Mar 6, 2018 · bbd4ad2 · bbd4ad2
2 parents 2cb4db4 + 883d94e
commit bbd4ad2
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
 # Zoho CRM Mac App
-This is built using Electron. You can download the latest release [here](https://github.com/christianpatrick/electron-zoho_crm/releases).
+This is built using Electron. You can download the prepared app for free [here](https://gum.co/nrAS) or a donation if you find it helpful :)
 
-![Screenshot of Zoho CRM](https://raw.githubusercontent.com/christianpatrick/electron-zoho_crm/master/screenshot.png)
+[![Screenshot of Zoho CRM](https://raw.githubusercontent.com/christianpatrick/electron-zoho_crm/master/screenshot.png)](https://gum.co/nrAS)
diff --git a/icon.icns b/icon.icns
diff --git a/main.js b/main.js
@@ -26,8 +26,6 @@ function createWindow () {
   $cssInclude = '#tabLayer{position:fixed;margin-top:-5px;height:45px;-webkit-app-region:drag;}.bodycontainer{padding-top:40px;}.newMenuTable{display:block;max-height:45px;}#qIconDiv{position:absolute;right:0;}#tabGroupMenuDiv{margin-left:65px;}';
   $cssSearch = '.newsearchimg,#searchStr{padding-left:75px;}#searchdetailsform{position:fixed;width:100%;}#gsearchDiv{padding-top:70px;}';
 
-  // and load the index.html of the app.
-  // mainWindow.loadURL('https://accounts.zoho.com/signin?servicename=ZohoCRM')
   mainWindow.loadURL('https://crm.zoho.com/')
 
   mainWindow.webContents.on('did-finish-load', function() {
@@ -45,16 +43,15 @@ function createWindow () {
     mainWindow.webContents.insertCSS($cssSearch)
   })
 
-  // Open the DevTools.
-  // mainWindow.webContents.openDevTools()
-
   // Emitted when the window is closed.
   mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
     mainWindow = null
   })
+
+  mainWindow.on('close', function(e){
+    e.preventDefault()
+    mainWindow.hide()
+  })
 }
 
 function createMenu() {
@@ -247,9 +244,6 @@ function createMenu() {
     },
   ];
 
-  // const { submenu } = template[1];
-  // submenu.splice(submenu.length - 1, 1);
-
   if (process.platform === 'darwin') {
     template.unshift({
       label: 'Electron',
@@ -339,7 +333,6 @@ app.on('window-all-closed', function () {
 app.on('activate', function () {
   // On OS X it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow()
-  }
+    mainWindow.webContents.executeJavaScript('document.getElementById("tab_Home").click()')
+    setTimeout(function(){mainWindow.show();}, 500)
 })
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "start": "electron .",
-    "package-mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --icon=icon.icns --prune=true --out=builds"
+    "package-mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --icon=zoho_crm-logo.icns --prune=true --out=builds"
   },
   "dependencies": {}
 }
diff --git a/splash.html b/splash.html
@@ -25,7 +25,7 @@
 			  width: 100%;
 			  height: 100%;
 			  border-radius: 50%;
-			  background-color: #A9A9A9;
+			  background-color: #C9C9C9;
 			  opacity: 0.6;
 			  position: absolute;
 			  top: 0;
@@ -54,7 +54,7 @@
 	</head>
 	<body>
 		<div class="splash">
-			<img src="splash.png" alt="Splash Logo">
+			<img src="zoho_crm-logo.svg" alt="Splash Logo">
 			<div class="spinner">
 				<div class="double-bounce1"></div>
 				<div class="double-bounce2"></div>

diff --git a/splash.png b/splash.png
diff --git a/zoho_crm-logo.icns b/zoho_crm-logo.icns
diff --git a/zoho_crm-logo.svg b/zoho_crm-logo.svg