From 68cc15d3af8ed742b16632851b2532cdfaeae9c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= Date: Thu, 7 May 2020 19:30:21 +0200 Subject: [PATCH] revert electron to previous version --- package-lock.json | 48 +++++++++++++++++------------------- package.json | 2 +- src/ui/views/messages.coffee | 3 +-- src/ui/views/trayicon.coffee | 19 ++++++++------ 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0644b98b..5e4a9177 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "yakyak", - "version": "1.5.5", + "version": "1.5.6", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1851,9 +1851,9 @@ } }, "electron": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-8.0.0.tgz", - "integrity": "sha512-vBXUKRqTUq0jv1upvISdvScDDH3uCPwXj4eA5BeR3UDbJp2hOhq7eJxwjIQbfLQql98aYz4X6pSlzBnhfyQqHA==", + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-7.2.4.tgz", + "integrity": "sha512-Z+R692uTzXgP8AHrabE+kkrMlQJ6pnAYoINenwj9QSqaD2YbO8IuXU9DMCcUY0+VpA91ee09wFZJNUKYPMnCKg==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -2424,27 +2424,6 @@ "debug": "^2.6.9", "mkdirp": "^0.5.4", "yauzl": "^2.10.0" - }, - "dependencies": { - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "dev": true, - "requires": { - "pend": "~1.2.0" - } - }, - "yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", - "dev": true, - "requires": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - } } }, "extsprintf": { @@ -2482,6 +2461,15 @@ "websocket-driver": ">=0.5.1" } }, + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "dev": true, + "requires": { + "pend": "~1.2.0" + } + }, "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", @@ -9151,6 +9139,16 @@ } } }, + "yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "dev": true, + "requires": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + }, "yazl": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz", diff --git a/package.json b/package.json index 0e5a955a..c663b836 100644 --- a/package.json +++ b/package.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", diff --git a/src/ui/views/messages.coffee b/src/ui/views/messages.coffee index 3f1f4844..e8092cd2 100644 --- a/src/ui/views/messages.coffee +++ b/src/ui/views/messages.coffee @@ -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 diff --git a/src/ui/views/trayicon.coffee b/src/ui/views/trayicon.coffee index b125206c..c2ac2e3e 100644 --- a/src/ui/views/trayicon.coffee +++ b/src/ui/views/trayicon.coffee @@ -1,4 +1,3 @@ -{nativeImage} = require("electron"); path = require 'path' os = require 'os' i18n = require 'i18n' @@ -6,21 +5,25 @@ 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', 'icon-read@20.png' "unread": path.join __dirname, '..', '..', 'icons', 'icon-unread@20.png' else - trayIcons = + trayIconsPath = "read": path.join __dirname, '..', '..', 'icons', 'icon-read@8x.png' "unread": path.join __dirname, '..', '..', 'icons', 'icon-unread@8x.png' +trayIcons = + "read": nativeImage.createFromPath(trayIconsPath["read"]) + "unread": nativeImage.createFromPath(trayIconsPath["unread"]) + tray = null # TODO: this is all WIP @@ -29,8 +32,7 @@ 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 @@ -38,6 +40,7 @@ create = () -> 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