revert electron to previous version

Author: averissimo

package-lock.json

@@ -79,7 +79,7 @@
     "chai": "^4.2.0",
     "coffeescript": "^1.9.3",
     "devtron": "^1.4.0",
-    "electron": "^8.0.0",
+    "electron": "^7.1.7",
     "electron-packager": "^14.1.1",
     "gulp": "^4.0.2",
     "gulp-changed": "^4.0.2",

package.json

@@ -246,8 +246,7 @@ drawMessage = (e, entity) ->
     mclz = ['message']
     mclz.push c for c in MESSAGE_CLASSES when e[c]?
     title = if e.timestamp then moment(e.timestamp / 1000).calendar() else null
-    div id:e.event_id, key:e.event_id, class:mclz.join(' '), title:title,
-        dir: 'auto', ->
+    div id:e.event_id, key:e.event_id, class:mclz.join(' '), title:title, dir: 'auto', ->
         if e.chat_message
             content = e.chat_message?.message_content
             format content

src/ui/views/messages.coffee

@@ -1,26 +1,29 @@
-{nativeImage} = require("electron");
 path = require 'path'
 os   = require 'os'
 i18n = require 'i18n'
 
 { Menu, Tray, nativeImage } = require('electron').remote
 
 if os.platform() == 'darwin'
-    trayIcons =
+    trayIconsPath =
         "read": path.join __dirname, '..', '..', 'icons', 'osx-icon-read-Template.png'
         "unread": path.join __dirname, '..', '..', 'icons', 'osx-icon-unread-Template.png'
 
 else if process.env.XDG_CURRENT_DESKTOP && process.env.XDG_CURRENT_DESKTOP.match(/KDE/)
     # This is to work around a bug with electron apps + KDE not showing correct icon size.
-    trayIcons =
+    trayIconsPath =
       "read": path.join __dirname, '..', '..', 'icons', '[email protected]'
       "unread": path.join __dirname, '..', '..', 'icons', '[email protected]'
 
 else
-    trayIcons =
+    trayIconsPath =
         "read": path.join __dirname, '..', '..', 'icons', '[email protected]'
         "unread": path.join __dirname, '..', '..', 'icons', '[email protected]'
 
+trayIcons =
+  "read": nativeImage.createFromPath(trayIconsPath["read"])
+  "unread": nativeImage.createFromPath(trayIconsPath["unread"])
+
 tray = null
 
 # TODO: this is all WIP
@@ -29,15 +32,15 @@ quit = ->
 compact = (array) -> item for item in array when item
 
 create = () ->
-    tray = new Tray(nativeImage.createEmpty());
-    tray.setImage(nativeImage.createFromPath(trayIcons["read"]));
+    tray = new Tray trayIcons["read"]
     tray.currentImage = 'read'
     tray.setToolTip i18n.__('title:YakYak - Hangouts Client')
     # Emitted when the tray icon is clicked
     tray.on 'click', -> action 'togglewindow'
 
 destroy = ->
     tray.destroy() if tray
+    console.log('is Destroyed', tray.isDestroyed())
     tray = null
 
 update = (unreadCount, viewstate) ->
@@ -91,10 +94,10 @@ update = (unreadCount, viewstate) ->
     # update icon
     try
         if unreadCount > 0
-            tray.setImage nativeImage.createFromPath(trayIcons["unread"]) unless tray.currentImage == 'unread'
+            tray.setImage trayIcons["unread"] unless tray.currentImage == 'unread'
             tray.currentImage = 'unread'
         else
-            tray.setImage nativeImage.createFromPath(trayIcons["read"]) unless tray.currentImage == 'read'
+            tray.setImage trayIcons["read"] unless tray.currentImage == 'read'
             tray.currentImage = 'read'
     catch e
         console.log 'missing icons', e