From 03782f01dba71709a6580afd1777e7bad8e06b66 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Tue, 15 Oct 2019 16:04:45 -0500
Subject: [PATCH] 3.0.18-beta1

---
 app/assets/javascripts/app/app.js                     | 6 +-----
 app/assets/javascripts/app/constants.js               | 2 +-
 app/assets/javascripts/app/controllers/footer.js      | 9 ++++-----
 app/assets/javascripts/app/controllers/home.js        | 4 ++--
 app/assets/javascripts/app/services/desktopManager.js | 2 +-
 package-lock.json                                     | 2 +-
 package.json                                          | 2 +-
 7 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js
index b780e9c1a..6ae22ff8d 100644
--- a/app/assets/javascripts/app/app.js
+++ b/app/assets/javascripts/app/app.js
@@ -43,11 +43,7 @@ function getPlatformString() {
 }
 
 function isDesktopApplication() {
-  return window && window.process && window.process.type && window.process.versions["electron"];
-}
-
-function isMacApplication() {
-  return window && window.process && window.process.type && window.process.platform == "darwin";
+  return window.isElectron;
 }
 
 /* Use with numbers and strings, not objects */
diff --git a/app/assets/javascripts/app/constants.js b/app/assets/javascripts/app/constants.js
index e69f18b94..0b4e280e8 100644
--- a/app/assets/javascripts/app/constants.js
+++ b/app/assets/javascripts/app/constants.js
@@ -1,5 +1,5 @@
 angular.module('app')
 
-.constant('appVersion', '3.0.17')
+.constant('appVersion', '3.0.18-beta1')
 
 ;
\ No newline at end of file
diff --git a/app/assets/javascripts/app/controllers/footer.js b/app/assets/javascripts/app/controllers/footer.js
index 03b41e5f9..24b7a003c 100644
--- a/app/assets/javascripts/app/controllers/footer.js
+++ b/app/assets/javascripts/app/controllers/footer.js
@@ -163,12 +163,11 @@ angular.module('app')
         this.lastSyncDate = new Date();
       }
 
-      $rootScope.$on("new-update-available", function(version){
-        $timeout(function(){
-          // timeout calls apply() which is needed
+      $rootScope.$on("new-update-available", () => {
+        $timeout(() => {
           this.onNewUpdateAvailable();
-        }.bind(this))
-      }.bind(this))
+        })
+      })
 
       this.onNewUpdateAvailable = function() {
         this.newUpdateAvailable = true;
diff --git a/app/assets/javascripts/app/controllers/home.js b/app/assets/javascripts/app/controllers/home.js
index 69071bfa5..9bef53d44 100644
--- a/app/assets/javascripts/app/controllers/home.js
+++ b/app/assets/javascripts/app/controllers/home.js
@@ -7,8 +7,8 @@ angular.module('app')
 
     $scope.platform = getPlatformString();
 
-    $scope.onUpdateAvailable = function(version) {
-      $rootScope.$broadcast('new-update-available', version);
+    $scope.onUpdateAvailable = function() {
+      $rootScope.$broadcast('new-update-available');
     }
 
     $rootScope.$on("panel-resized", (event, info) => {
diff --git a/app/assets/javascripts/app/services/desktopManager.js b/app/assets/javascripts/app/services/desktopManager.js
index eb1e6e866..ad4f816e9 100644
--- a/app/assets/javascripts/app/services/desktopManager.js
+++ b/app/assets/javascripts/app/services/desktopManager.js
@@ -71,7 +71,7 @@ class DesktopManager {
       return;
     }
     this.lastSearchedText = text;
-    this.searchHandler(text);
+    this.searchHandler && this.searchHandler(text);
   }
 
   redoSearch()  {
diff --git a/package-lock.json b/package-lock.json
index 2cde93ff0..18a070ee5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.0.17",
+  "version": "3.0.18-beta1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0ee077fc7..ad1b6580c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.0.17",
+  "version": "3.0.18-beta1",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",