From 35c8a4ff32e889c683f43fd1ce274c13e3786c4f Mon Sep 17 00:00:00 2001 From: gegu Date: Sat, 7 Mar 2020 11:12:34 +0100 Subject: [PATCH 1/9] Swtiched to .on('click') for toucbar interactions --- css/style.css | 6 ++++++ js/touchBar.js | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/css/style.css b/css/style.css index 7941b7c..9ddec6d 100644 --- a/css/style.css +++ b/css/style.css @@ -145,6 +145,12 @@ h1 { color: white; } +.touch-bar:hover, +.touchBarElement:hover { + cursor: pointer; +} + + .disabled-icon { color: #333; } diff --git a/js/touchBar.js b/js/touchBar.js index 92354d6..aa70a79 100644 --- a/js/touchBar.js +++ b/js/touchBar.js @@ -31,7 +31,7 @@ class TouchBar { el.classList = name + " touchBarElement"; el.style.lineHeight = self.height; el.style.fontSize = ($('#touch-bar-container').height()*0.8) + 'px'; - $(el).on('touchend', function(event) { + $(el).on('click', function(event) { // don't bubble up events to prevent disappearing sweetalert messages event.preventDefault(); clearTimeout(self.autoHideTimerId); @@ -47,7 +47,7 @@ class TouchBar { touchBarContainer.appendChild(touchBarBlur); touchBarContainer.appendChild(touchBar); - $("#touch-container").on('touchend', function(event) { + $("#touch-container").on('click', function(event) { self.toggle() }); } From cbea9d163dd0efeab576407c5835e19e9f61e3cd Mon Sep 17 00:00:00 2001 From: gegu Date: Sat, 7 Mar 2020 12:36:40 +0100 Subject: [PATCH 2/9] Mouse support and touch gestures swipe/pinch/zoom --- js/renderer.js | 43 +++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 5 +++++ package.json | 1 + 3 files changed, 49 insertions(+) diff --git a/js/renderer.js b/js/renderer.js index c2d9f45..9f9a425 100644 --- a/js/renderer.js +++ b/js/renderer.js @@ -6,6 +6,7 @@ const Swal = require("sweetalert2"); const randomColor = require("randomcolor"); const chroma = require("chroma-js"); const velocity = require("velocity-animate"); +const Hammer = require('hammerjs'); const logger = remote.getGlobal("rendererLogger"); const config = remote.getGlobal("config"); const {TouchBar, TouchBarElement} = require("./js/touchBar.js") @@ -49,6 +50,48 @@ if (config.playSoundOnRecieve !== false) { if (config.touchBar) { touchBar = new TouchBar(touchBarElements, config.touchBar) + // initialize swipe/pinch gestures + new Hammer.Manager(document.getElementById('touch-container'), { + recognizers: [ + [Hammer.Swipe, { direction: Hammer.DIRECTION_HORIZONTAL }], + [Hammer.Pinch] + ] + }) + // Subscribe to the desired events + .on('swipe pinch', function(event) { + switch(event.type) { + case 'swipe': + $('.imgcontainer').animate({ left: (event.offsetDirection === Hammer.DIRECTION_LEFT ? '-=' : '+=') + '100%'}, 50, + () => $(event.offsetDirection === Hammer.DIRECTION_LEFT ? '.nextImage' : '.previousImage').trigger('click') + ); + break; + case 'pinch': + if (event.scale) { + const MAX_SCALE_FACTOR = 5; + const ZOOM_FACTOR = 1; + const $assetContainer = $container.find('.imgcontainer'); + if (!isPaused) { + pause(); + } + + if ($assetContainer.length > 0) { + let attrib = 'height'; + // get the current zomm (starts with '100%') + let currentZoom = $assetContainer[0].style.width; + if (currentZoom) { + attrib = 'width'; + } else { + currentZoom = $assetContainer[0].style.height; + } + currentZoom = parseInt(currentZoom.replace('%', '')) || 100; + $assetContainer.css(`max-${attrib}`, ''); + $assetContainer[attrib](Math.min((100 * MAX_SCALE_FACTOR), Math.max((100 / MAX_SCALE_FACTOR), currentZoom + (event.scale > 1.0 ? ZOOM_FACTOR : -ZOOM_FACTOR))) + '%'); + } + } + break; + } + }); + } else { // handle touch events for navigation and voice reply $("body").on('touchstart', function() { diff --git a/package-lock.json b/package-lock.json index 02eab1d..f1a26f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -582,6 +582,11 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, + "hammerjs": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=" + }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", diff --git a/package.json b/package.json index 958f931..6861132 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "chroma-js": "^2.1.0", "dotenv": "^8.2.0", "electron": "^7.1.10", + "hammerjs": "^2.0.8", "image-downloader": "^3.5.0", "jquery": "^3.4.1", "moment": "^2.24.0", From ed150c98842f763c3197bff7cc7b5d007220f1db Mon Sep 17 00:00:00 2001 From: gegu Date: Sat, 7 Mar 2020 15:39:47 +0100 Subject: [PATCH 3/9] Configurable per event scale factor --- js/defaultConfig.js | 5 +++++ js/renderer.js | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/defaultConfig.js b/js/defaultConfig.js index dc14dba..e8a9a9c 100644 --- a/js/defaultConfig.js +++ b/js/defaultConfig.js @@ -176,6 +176,11 @@ var defaultConfig = { ] }, + gestures: { + // max percent per event for pinch/zoom gestures + maxScalePercent: 15 + }, + // options for the addonHandler class addonInterface: { // configure which types should be logged diff --git a/js/renderer.js b/js/renderer.js index 9f9a425..fcca16e 100644 --- a/js/renderer.js +++ b/js/renderer.js @@ -67,8 +67,7 @@ if (config.touchBar) { break; case 'pinch': if (event.scale) { - const MAX_SCALE_FACTOR = 5; - const ZOOM_FACTOR = 1; + const MAX_SCALE_FACTOR = config.gestures.maxScalePercent; const $assetContainer = $container.find('.imgcontainer'); if (!isPaused) { pause(); @@ -85,7 +84,7 @@ if (config.touchBar) { } currentZoom = parseInt(currentZoom.replace('%', '')) || 100; $assetContainer.css(`max-${attrib}`, ''); - $assetContainer[attrib](Math.min((100 * MAX_SCALE_FACTOR), Math.max((100 / MAX_SCALE_FACTOR), currentZoom + (event.scale > 1.0 ? ZOOM_FACTOR : -ZOOM_FACTOR))) + '%'); + $assetContainer[attrib](Math.min((100 * MAX_SCALE_FACTOR), Math.max((100 / MAX_SCALE_FACTOR), currentZoom + (event.scale > 1.0 ? 1 : -1))) + '%'); } } break; From 68fcf5265a4b25c8a21e52a193e9f29e798d3f49 Mon Sep 17 00:00:00 2001 From: gegu Date: Sat, 7 Mar 2020 19:46:37 +0100 Subject: [PATCH 4/9] Enhance swipe transition. Outsource gesture handling --- js/defaultConfig.js | 8 ++++-- js/renderer.js | 50 +++++++---------------------------- js/touchGestures.js | 63 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 42 deletions(-) create mode 100644 js/touchGestures.js diff --git a/js/defaultConfig.js b/js/defaultConfig.js index e8a9a9c..caffe38 100644 --- a/js/defaultConfig.js +++ b/js/defaultConfig.js @@ -177,8 +177,12 @@ var defaultConfig = { }, gestures: { - // max percent per event for pinch/zoom gestures - maxScalePercent: 15 + // enable gesture support + enabled: true, + // percent per event for pinch/zoom gestures + zoomPercentPerEvent: 1.5, + // maximum factor to zoom/shrink + maxScaleFactor: 5 }, // options for the addonHandler class diff --git a/js/renderer.js b/js/renderer.js index fcca16e..751c958 100644 --- a/js/renderer.js +++ b/js/renderer.js @@ -6,10 +6,10 @@ const Swal = require("sweetalert2"); const randomColor = require("randomcolor"); const chroma = require("chroma-js"); const velocity = require("velocity-animate"); -const Hammer = require('hammerjs'); const logger = remote.getGlobal("rendererLogger"); const config = remote.getGlobal("config"); const {TouchBar, TouchBarElement} = require("./js/touchBar.js") +const initGestures = require('./js/touchGestures.js'); // Inform that Renderer started logger.info("Renderer started ..."); @@ -51,46 +51,16 @@ if (config.playSoundOnRecieve !== false) { if (config.touchBar) { touchBar = new TouchBar(touchBarElements, config.touchBar) // initialize swipe/pinch gestures - new Hammer.Manager(document.getElementById('touch-container'), { - recognizers: [ - [Hammer.Swipe, { direction: Hammer.DIRECTION_HORIZONTAL }], - [Hammer.Pinch] - ] - }) - // Subscribe to the desired events - .on('swipe pinch', function(event) { - switch(event.type) { - case 'swipe': - $('.imgcontainer').animate({ left: (event.offsetDirection === Hammer.DIRECTION_LEFT ? '-=' : '+=') + '100%'}, 50, - () => $(event.offsetDirection === Hammer.DIRECTION_LEFT ? '.nextImage' : '.previousImage').trigger('click') - ); - break; - case 'pinch': - if (event.scale) { - const MAX_SCALE_FACTOR = config.gestures.maxScalePercent; - const $assetContainer = $container.find('.imgcontainer'); - if (!isPaused) { - pause(); - } - - if ($assetContainer.length > 0) { - let attrib = 'height'; - // get the current zomm (starts with '100%') - let currentZoom = $assetContainer[0].style.width; - if (currentZoom) { - attrib = 'width'; - } else { - currentZoom = $assetContainer[0].style.height; - } - currentZoom = parseInt(currentZoom.replace('%', '')) || 100; - $assetContainer.css(`max-${attrib}`, ''); - $assetContainer[attrib](Math.min((100 * MAX_SCALE_FACTOR), Math.max((100 / MAX_SCALE_FACTOR), currentZoom + (event.scale > 1.0 ? 1 : -1))) + '%'); - } + if (config.gestures.enabled) { + initGestures(config, { + pauseCallback: () => { + if (!isPaused) { + pause(); } - break; - } - }); - + }, + loadImage: loadImage + }); + } } else { // handle touch events for navigation and voice reply $("body").on('touchstart', function() { diff --git a/js/touchGestures.js b/js/touchGestures.js new file mode 100644 index 0000000..25754db --- /dev/null +++ b/js/touchGestures.js @@ -0,0 +1,63 @@ +const Hammer = require('hammerjs'); +const $ = require('jquery'); + + +/** + * Initialize touch gesture handling + * @param {object} config TeleFrame configuration object + * @param {object} options object providing callbacks for loadImage and pause + * { + * loadImage: function loadImage(next, fadeTime) {...}, + * pause: function pause() {...} + * } + * @return {undefined} + */ +const initGestures = (config, options) => { + // initialize swipe/pinch gestures + new Hammer.Manager(document.getElementById('touch-container'), { + recognizers: [ + [Hammer.Swipe, { direction: Hammer.DIRECTION_HORIZONTAL }], + [Hammer.Pinch] + ] + }) + // Subscribe to the desired events + .on('swipe pinch', function(event) { + switch(event.type) { + case 'swipe': + if (typeof options.loadImage !== 'function') { + $('.imgcontainer').animate({ left: (event.offsetDirection === Hammer.DIRECTION_LEFT ? '-=' : '+=') + '100%'}, 50, + () => $(event.offsetDirection === Hammer.DIRECTION_LEFT ? '.nextImage' : '.previousImage').trigger('click') + ); + } else { + $('.imgcontainer').animate({ left: (event.offsetDirection === Hammer.DIRECTION_LEFT ? '-=' : '+=') + '100%'}, 50); + options.loadImage(event.offsetDirection === Hammer.DIRECTION_LEFT, Math.max(config.fadeTime, 500) / 3); + } + break; + case 'pinch': + if (event.scale) { + const MAX_SCALE_FACTOR = config.gestures.maxScaleFactor; + const ZOOM_PERCENT = config.gestures.zoomPercentPerEvent; + const $assetContainer = $container.find('.imgcontainer'); + if (typeof options.pauseCallback === 'function') { + options.pauseCallback(); + } + if ($assetContainer.length > 0) { + let attrib = 'height'; + // get the current zomm (starts with '100%') + let currentZoom = $assetContainer[0].style.width; + if (currentZoom) { + attrib = 'width'; + } else { + currentZoom = $assetContainer[0].style.height; + } + currentZoom = parseInt(currentZoom.replace('%', '')) || 100; + $assetContainer.css(`max-${attrib}`, ''); + $assetContainer[attrib](Math.min((100 * MAX_SCALE_FACTOR), Math.max((100 / MAX_SCALE_FACTOR), currentZoom + (event.scale > 1.0 ? ZOOM_PERCENT : -ZOOM_PERCENT))) + '%'); + } + } + break; + } + }); +} + +module.exports = initGestures; From 663712d339bf4f634ef991fcd84115de875cf4f7 Mon Sep 17 00:00:00 2001 From: gegu Date: Sun, 8 Mar 2020 10:27:02 +0100 Subject: [PATCH 5/9] Velocity img change use queue: false. Fix addon doc --- addons/README.md | 2 +- js/renderer.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/README.md b/addons/README.md index 9ee2e34..51e1c73 100644 --- a/addons/README.md +++ b/addons/README.md @@ -115,7 +115,7 @@ The base class from which addons are inherited. If you use the function interfac | `changingActiveImage` | Notification before changing the current image. | | | *Argument*: currentImageIndex, fadeTime (ms) | | `changedActiveImage` | Notification that the current image has been changed. | - | | *Argument*: currentImageIndex (ms) | + | | *Argument*: currentImageIndex | diff --git a/js/renderer.js b/js/renderer.js index 751c958..80fcfa7 100644 --- a/js/renderer.js +++ b/js/renderer.js @@ -710,10 +710,12 @@ function loadImage(isNext, fadeTime, goToLatest = false) { cleanUp(); } else { $assetDiv.velocity("fadeIn", { - duration: fadeTime + duration: fadeTime, + queue: false }); $currentAsset.velocity("fadeOut", { duration: fadeTime, + queue: false, complete: function() { $(this).remove(); cleanUp(); From 259709da3f4d54385e9848f54a5330a63c2003bd Mon Sep 17 00:00:00 2001 From: gegu Date: Sun, 8 Mar 2020 12:14:35 +0100 Subject: [PATCH 6/9] Configurable swipe transition durations --- js/defaultConfig.js | 6 +++++- js/touchGestures.js | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/defaultConfig.js b/js/defaultConfig.js index caffe38..c03cb5a 100644 --- a/js/defaultConfig.js +++ b/js/defaultConfig.js @@ -179,9 +179,13 @@ var defaultConfig = { gestures: { // enable gesture support enabled: true, + // swipe image out duration + swipeAnimationDuration: 400, + // fade in duration for the loading image + swipeFadeInImgDuration: 600, // percent per event for pinch/zoom gestures zoomPercentPerEvent: 1.5, - // maximum factor to zoom/shrink + // maximum factor for zoom/shrink operations maxScaleFactor: 5 }, diff --git a/js/touchGestures.js b/js/touchGestures.js index 25754db..30bf2dd 100644 --- a/js/touchGestures.js +++ b/js/touchGestures.js @@ -29,8 +29,8 @@ const initGestures = (config, options) => { () => $(event.offsetDirection === Hammer.DIRECTION_LEFT ? '.nextImage' : '.previousImage').trigger('click') ); } else { - $('.imgcontainer').animate({ left: (event.offsetDirection === Hammer.DIRECTION_LEFT ? '-=' : '+=') + '100%'}, 50); - options.loadImage(event.offsetDirection === Hammer.DIRECTION_LEFT, Math.max(config.fadeTime, 500) / 3); + $('.imgcontainer').animate({ left: (event.offsetDirection === Hammer.DIRECTION_LEFT ? '-=' : '+=') + '100%'}, config.gestures.swipeAnimationDuration); + options.loadImage(event.offsetDirection === Hammer.DIRECTION_LEFT, config.gestures.swipeFadeInImgDuration); } break; case 'pinch': From 9fb5a5d429aee61dcb259ae492e7902a1fe68e11 Mon Sep 17 00:00:00 2001 From: gegu Date: Sun, 8 Mar 2020 13:37:06 +0100 Subject: [PATCH 7/9] Change swipe duration defaults. --- js/defaultConfig.js | 2 +- js/touchGestures.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/js/defaultConfig.js b/js/defaultConfig.js index c03cb5a..ae9e52e 100644 --- a/js/defaultConfig.js +++ b/js/defaultConfig.js @@ -182,7 +182,7 @@ var defaultConfig = { // swipe image out duration swipeAnimationDuration: 400, // fade in duration for the loading image - swipeFadeInImgDuration: 600, + swipeFadeInImgDuration: 800, // percent per event for pinch/zoom gestures zoomPercentPerEvent: 1.5, // maximum factor for zoom/shrink operations diff --git a/js/touchGestures.js b/js/touchGestures.js index 30bf2dd..b2f868f 100644 --- a/js/touchGestures.js +++ b/js/touchGestures.js @@ -1,6 +1,4 @@ const Hammer = require('hammerjs'); -const $ = require('jquery'); - /** * Initialize touch gesture handling @@ -29,7 +27,7 @@ const initGestures = (config, options) => { () => $(event.offsetDirection === Hammer.DIRECTION_LEFT ? '.nextImage' : '.previousImage').trigger('click') ); } else { - $('.imgcontainer').animate({ left: (event.offsetDirection === Hammer.DIRECTION_LEFT ? '-=' : '+=') + '100%'}, config.gestures.swipeAnimationDuration); + $('.imgcontainer').animate({ left: (event.offsetDirection === Hammer.DIRECTION_LEFT ? '-=' : '+=') + '110%'}, config.gestures.swipeAnimationDuration); options.loadImage(event.offsetDirection === Hammer.DIRECTION_LEFT, config.gestures.swipeFadeInImgDuration); } break; From 78fe8b0d7e935d5885c5dec686132ba00bb0d68b Mon Sep 17 00:00:00 2001 From: gegu Date: Sun, 8 Mar 2020 13:37:25 +0100 Subject: [PATCH 8/9] Update packages, electron 8. --- main.js | 2 + package-lock.json | 102 +++++++++++++++++++++++----------------------- package.json | 8 ++-- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/main.js b/main.js index 8cb8956..97bc051 100644 --- a/main.js +++ b/main.js @@ -28,6 +28,8 @@ if(config.switchLedsOff){ } app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required"); +// avoid deprecation warning from electron 8 +app.allowRendererProcessReuse = true; // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the JavaScript object is garbage collected. let win; diff --git a/package-lock.json b/package-lock.json index f1a26f3..c2ac5bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@electron/get": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.7.2.tgz", - "integrity": "sha512-LSE4LZGMjGS9TloDx0yO44D2UTbaeKRk+QjlhWLiQlikV6J4spgDCjb6z4YIcqmPAwNzlNCnWF4dubytwI+ATA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.9.0.tgz", + "integrity": "sha512-OBIKtF6ttIJotDXe4KJMUyTBO4xMii+mFjlA8R4CORuD4HvCUaCK3lPjhdTRCvuEv6gzWNbAvd9DNBv0v780lw==", "requires": { "debug": "^4.1.1", "env-paths": "^2.2.0", @@ -15,14 +15,15 @@ "global-agent": "^2.0.2", "global-tunnel-ng": "^2.7.1", "got": "^9.6.0", + "progress": "^2.0.3", "sanitize-filename": "^1.6.2", "sumchecker": "^3.0.1" } }, "@fortawesome/fontawesome-free": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.0.tgz", - "integrity": "sha512-vKDJUuE2GAdBERaQWmmtsciAMzjwNrROXA5KTGSZvayAsmuTGjam5z6QNqNPCwDfVljLWuov1nEC3mEQf/n6fQ==" + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.1.tgz", + "integrity": "sha512-ZtjIIFplxncqxvogq148C3hBLQE+W3iJ8E4UvJ09zIJUgzwLcROsWwFDErVSXY2Plzao5J9KUYNHKHMEUYDMKw==" }, "@sindresorhus/is": { "version": "0.14.0", @@ -38,9 +39,9 @@ } }, "@types/node": { - "version": "12.12.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.26.tgz", - "integrity": "sha512-UmUm94/QZvU5xLcUlNR8hA7Ac+fGpO1EG/a8bcWVz0P0LqtxFmun9Y2bbtuckwGboWJIT70DoWq1r3hb56n3DA==" + "version": "12.12.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.29.tgz", + "integrity": "sha512-yo8Qz0ygADGFptISDj3pOC9wXfln/5pQaN/ysDIzOaAWXt73cNHmtEC8zSO2Y+kse/txmwIAJzkYZ5fooaS5DQ==" }, "ajv": { "version": "6.10.2", @@ -98,9 +99,9 @@ } }, "boolean": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.0.tgz", - "integrity": "sha512-OElxJ1lUSinuoUnkpOgLmxp0DC4ytEhODEL6QJU0NpxE/mI4rUSh8h1P1Wkvfi3xQEBcxXR2gBIPNYNuaFcAbQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", + "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", "optional": true }, "buffer-from": { @@ -238,9 +239,9 @@ } }, "core-js": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz", - "integrity": "sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ==", + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", + "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==", "optional": true }, "core-util-is": { @@ -360,9 +361,9 @@ } }, "electron": { - "version": "7.1.10", - "resolved": "https://registry.npmjs.org/electron/-/electron-7.1.10.tgz", - "integrity": "sha512-UDpS2CfBN3yufCrbET5Ozw1XrLhuANHn+Zs8Vgl/BcBT/MoNbkY79nRFcyxj6pCFrEde9IoNOf+DgNp6altNxw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-8.1.0.tgz", + "integrity": "sha512-6Z/aUDbP4UIhqaBQzRb5wSMTLhY7wPtqikfWqpaJpuHzMaT2mS+fkbnxUU2fHkETPdMj0GAWwFkVWCEJX0g+EQ==", "requires": { "@electron/get": "^1.0.1", "@types/node": "^12.0.12", @@ -524,17 +525,17 @@ } }, "global-agent": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.7.tgz", - "integrity": "sha512-ooK7eqGYZku+LgnbfH/Iv0RJ74XfhrBZDlke1QSzcBt0bw1PmJcnRADPAQuFE+R45pKKDTynAr25SBasY2kvow==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.8.tgz", + "integrity": "sha512-VpBe/rhY6Rw2VDOTszAMNambg+4Qv8j0yiTNDYEXXXxkUNGWLHp8A3ztK4YDBbFNcWF4rgsec6/5gPyryya/+A==", "optional": true, "requires": { "boolean": "^3.0.0", - "core-js": "^3.4.1", + "core-js": "^3.6.4", "es6-error": "^4.1.1", - "matcher": "^2.0.0", - "roarr": "^2.14.5", - "semver": "^6.3.0", + "matcher": "^2.1.0", + "roarr": "^2.15.2", + "semver": "^7.1.2", "serialize-error": "^5.0.0" } }, @@ -602,9 +603,9 @@ } }, "http-cache-semantics": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz", - "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" }, "http-signature": { "version": "1.2.0", @@ -919,6 +920,11 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" + }, "promise-polyfill": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", @@ -1016,14 +1022,14 @@ } }, "roarr": { - "version": "2.14.6", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.14.6.tgz", - "integrity": "sha512-qjbw0BEesKA+3XFBPt+KVe1PC/Z6ShfJ4wPlx2XifqH5h2Lj8/KQT5XJTsy3n1Es5kai+BwKALaECW3F70B1cg==", + "version": "2.15.2", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.2.tgz", + "integrity": "sha512-jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q==", "optional": true, "requires": { "boolean": "^3.0.0", "detect-node": "^2.0.4", - "globalthis": "^1.0.0", + "globalthis": "^1.0.1", "json-stringify-safe": "^5.0.1", "semver-compare": "^1.0.0", "sprintf-js": "^1.1.2" @@ -1053,9 +1059,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz", + "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==", "optional": true }, "semver-compare": { @@ -1166,14 +1172,14 @@ } }, "sweetalert2": { - "version": "9.5.4", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-9.5.4.tgz", - "integrity": "sha512-9FSmW9mCbRTHyx6Nbtgeb5348pJYNGaBafn3reKe/Zx/gOBgxsRVHj3GQ4VusU/tuqDobKAIHUdUvNdsU3MXPQ==" + "version": "9.9.0", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-9.9.0.tgz", + "integrity": "sha512-vJAJaVnNXxwah8QIwtuu6It8BRXP5xWlzcxF+bERDmQKr/1/9iWhoKQF7FF92CvV0FJ1LAGj2Is/0xMkQzGhmw==" }, "telegraf": { - "version": "3.35.0", - "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-3.35.0.tgz", - "integrity": "sha512-C60rps0vEnKcg8ZwS3czwFRVUsq10tn+babK+ujdQeflX267yqB8sw4vVV7c7qCApccqI7sbCrBOPRVb2+4MoQ==", + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-3.36.0.tgz", + "integrity": "sha512-9o6AJKRiTm5vMWYI6WpTfBHzu4FMpWBNKxvnMxRds/cbMY9RnsVVjdi8i4bFFlfd+xbi73EbrnI3dybayryICA==", "requires": { "@types/node": "^13.1.0", "debug": "^4.0.1", @@ -1185,17 +1191,9 @@ }, "dependencies": { "@types/node": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.2.tgz", - "integrity": "sha512-B8emQA1qeKerqd1dmIsQYnXi+mmAzTB7flExjmy5X1aVAKFNNNDubkavwR13kR6JnpeLp3aLoJhwn9trWPAyFQ==" - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } + "version": "13.9.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.0.tgz", + "integrity": "sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ==" } } }, diff --git a/package.json b/package.json index 6861132..2daabeb 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,10 @@ }, "homepage": "https://github.com/LukeSkywalker92/teleframe#readme", "dependencies": { - "@fortawesome/fontawesome-free": "^5.12.0", + "@fortawesome/fontawesome-free": "^5.12.1", "chroma-js": "^2.1.0", "dotenv": "^8.2.0", - "electron": "^7.1.10", + "electron": "^8.1.0", "hammerjs": "^2.0.8", "image-downloader": "^3.5.0", "jquery": "^3.4.1", @@ -31,8 +31,8 @@ "node-schedule": "^1.3.2", "randomcolor": "^0.5.4", "sweetalert": "^2.1.2", - "sweetalert2": "^9.5.4", - "telegraf": "^3.35.0", + "sweetalert2": "^9.9.0", + "telegraf": "^3.36.0", "velocity-animate": "^1.5.2", "winston": "^3.2.1" } From 03996acbae94524cfb85ce7a1e667faed3b65509 Mon Sep 17 00:00:00 2001 From: gegu Date: Sun, 15 Mar 2020 17:30:22 +0100 Subject: [PATCH 9/9] Updated electron and sweetalert2 --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index c2ac5bc..a022537 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,9 +39,9 @@ } }, "@types/node": { - "version": "12.12.29", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.29.tgz", - "integrity": "sha512-yo8Qz0ygADGFptISDj3pOC9wXfln/5pQaN/ysDIzOaAWXt73cNHmtEC8zSO2Y+kse/txmwIAJzkYZ5fooaS5DQ==" + "version": "12.12.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz", + "integrity": "sha512-sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg==" }, "ajv": { "version": "6.10.2", @@ -361,9 +361,9 @@ } }, "electron": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-8.1.0.tgz", - "integrity": "sha512-6Z/aUDbP4UIhqaBQzRb5wSMTLhY7wPtqikfWqpaJpuHzMaT2mS+fkbnxUU2fHkETPdMj0GAWwFkVWCEJX0g+EQ==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-8.1.1.tgz", + "integrity": "sha512-t+5zzFo7VOgckJc9YpImHJkpqeWxwpmEjywWbAa4IT5MULS7h1XU52H9gMswK/y8xc5lBNwxLhJSty/15+gi1A==", "requires": { "@electron/get": "^1.0.1", "@types/node": "^12.0.12", @@ -1172,9 +1172,9 @@ } }, "sweetalert2": { - "version": "9.9.0", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-9.9.0.tgz", - "integrity": "sha512-vJAJaVnNXxwah8QIwtuu6It8BRXP5xWlzcxF+bERDmQKr/1/9iWhoKQF7FF92CvV0FJ1LAGj2Is/0xMkQzGhmw==" + "version": "9.10.1", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-9.10.1.tgz", + "integrity": "sha512-8wQIqk1bRub5SwE4mQIgzHdgGoh0NVwmC5peSmhDtKwZpwPO0Be8ucPtCTuO/VROPwvrlkyWFKwSPaPJejft7Q==" }, "telegraf": { "version": "3.36.0", diff --git a/package.json b/package.json index 2daabeb..3151beb 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "node-schedule": "^1.3.2", "randomcolor": "^0.5.4", "sweetalert": "^2.1.2", - "sweetalert2": "^9.9.0", + "sweetalert2": "^9.10.1", "telegraf": "^3.36.0", "velocity-animate": "^1.5.2", "winston": "^3.2.1"