From 0ec9f8e9716d9b191d85d44e13bdce3c8cf1d551 Mon Sep 17 00:00:00 2001 From: Jean van Kasteel Date: Mon, 26 Dec 2016 16:34:55 +0100 Subject: [PATCH 01/34] touchscreen fixes #561 --- src/app/lib/views/player/player.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/lib/views/player/player.js b/src/app/lib/views/player/player.js index c92ed36233..6ed6aa8323 100644 --- a/src/app/lib/views/player/player.js +++ b/src/app/lib/views/player/player.js @@ -414,7 +414,8 @@ this.player.click = 0; this.player.tech.off('mousedown'); // stop listening to default ev this.player.tech.on('mouseup', this.onClick.bind(this)); - $('#video_player').dblclick(this.onDbClick.bind(this)); + this.player.tech.on('touchend', this.onClick.bind(this)); // touchscreen fix + this.player.tech.on('dblclick', this.onDbClick.bind(this)); // Force custom controls this.player.usingNativeControls(false); From 8e20187be379f82fde226f54e41f0a61916c24bd Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Mon, 26 Dec 2016 17:27:01 +0100 Subject: [PATCH 02/34] win.on{restore,maximize} - restore state on app start - display the right icon on windows - fixes #560 --- src/app/app.js | 106 +++++++++++++++++++-------------- src/app/lib/views/title_bar.js | 10 ++-- 2 files changed, 65 insertions(+), 51 deletions(-) diff --git a/src/app/app.js b/src/app/app.js index 1ef2c3bc6c..f17c19576c 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -100,6 +100,7 @@ App.addInitializer(function (options) { var width = parseInt(localStorage.width ? localStorage.width : Settings.defaultWidth); var height = parseInt(localStorage.height ? localStorage.height : Settings.defaultHeight); + var isMaximized = Boolean(parseInt(localStorage.isMaximized)); var x = parseInt(localStorage.posX ? localStorage.posX : -1); var y = parseInt(localStorage.posY ? localStorage.posY : -1); @@ -128,8 +129,13 @@ App.addInitializer(function (options) { } win.zoomLevel = zoom; - win.resizeTo(width, height); - win.moveTo(x, y); + + if (isMaximized) { + win.maximize(); + } else { + win.resizeTo(width, height); + win.moveTo(x, y); + } }); var initTemplates = function () { @@ -153,7 +159,7 @@ var initApp = function () { // -m argument to open minimized to tray if (nw.App.fullArgv.indexOf('-m') === -1) { - win.show(); + win.show(true); } try { @@ -213,35 +219,6 @@ var delCache = function () { win.close(true); }; -win.on('resize', function (width, height) { - localStorage.width = Math.round(width); - localStorage.height = Math.round(height); -}); - -win.on('move', function (x, y) { - localStorage.posX = Math.round(x); - localStorage.posY = Math.round(y); -}); - -win.on('enter-fullscreen', function () { - App.vent.trigger('window:focus'); -}); - -// Wipe the tmpFolder when closing the app (this frees up disk space) -win.on('close', function () { - if (App.settings.deleteTmpOnClose) { - deleteFolder(App.settings.tmpLocation); - } - if (fs.existsSync(path.join(data_path, 'logs.txt'))) { - fs.unlinkSync(path.join(data_path, 'logs.txt')); - } - try { - delCache(); - } catch (e) { - win.close(true); - } -}); - String.prototype.capitalize = function () { return this.charAt(0).toUpperCase() + this.slice(1); }; @@ -656,6 +633,58 @@ if (nw.App.fullArgv.indexOf('-f') !== -1) { win.enterFullscreen(); } +// nwjs window events +win.on('resize', function (width, height) { + localStorage.width = Math.round(width); + localStorage.height = Math.round(height); +}); + +win.on('move', function (x, y) { + localStorage.posX = Math.round(x); + localStorage.posY = Math.round(y); +}); + +win.on('enter-fullscreen', function () { + App.vent.trigger('window:focus'); +}); + +win.on('minimize', function () { + if (Settings.minimizeToTray) { + minimizeToTray(); + } +}); + +win.on('maximize', function () { + localStorage.isMaximized = 1; + if (process.platform === 'win32') { + $('.os-max').addClass('os-is-max'); + } +}); + +win.on('restore', function () { + if (Boolean(parseInt(localStorage.isMaximized))) { + localStorage.isMaximized = 0; + } + if (process.platform === 'win32') { + $('.os-max').removeClass('os-is-max'); + } +}); + +// Wipe the tmpFolder when closing the app (this frees up disk space) +win.on('close', function () { + if (App.settings.deleteTmpOnClose) { + deleteFolder(App.settings.tmpLocation); + } + if (fs.existsSync(path.join(data_path, 'logs.txt'))) { + fs.unlinkSync(path.join(data_path, 'logs.txt')); + } + try { + delCache(); + } catch (e) { + win.close(true); + } +}); + nw.App.on('open', function (cmd) { var file; if (os.platform() === 'win32') { @@ -682,19 +711,6 @@ nw.App.on('open', function (cmd) { } }); -win.on('minimize', function () { - if (Settings.minimizeToTray) { - minimizeToTray(); - } -}); - -// When win.focus() doesn't do it's job right, play dirty. -App.vent.on('window:focus', function () { - win.setAlwaysOnTop(true); - win.focus(); - win.setAlwaysOnTop(Settings.alwaysOnTop); -}); - // On uncaught exceptions, log to console. process.on('uncaughtException', function (err) { try { diff --git a/src/app/lib/views/title_bar.js b/src/app/lib/views/title_bar.js index 178693ec2e..571413da2f 100644 --- a/src/app/lib/views/title_bar.js +++ b/src/app/lib/views/title_bar.js @@ -58,14 +58,8 @@ } else { if (window.screen.availHeight <= this.nativeWindow.height) { this.nativeWindow.restore(); - if (process.platform === 'win32') { - $('.os-max').removeClass('os-is-max'); - } } else { this.nativeWindow.maximize(); - if (process.platform === 'win32') { - $('.os-max').addClass('os-is-max'); - } } } }, @@ -95,6 +89,10 @@ 'hide': 100 } }); + + if (process.platform === 'win32' && Boolean(parseInt(localStorage.isMaximized))) { + $('.os-max').addClass('os-is-max'); + } } }); From 734026e83efb9a10695f6261c93a3023d6adea6a Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Mon, 26 Dec 2016 18:42:33 +0100 Subject: [PATCH 03/34] adapt for removed event --- src/app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.js b/src/app/app.js index f17c19576c..22b4572eae 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -645,7 +645,7 @@ win.on('move', function (x, y) { }); win.on('enter-fullscreen', function () { - App.vent.trigger('window:focus'); + win.focus(); }); win.on('minimize', function () { From fd782cadb6a1bded564704bb759b7c26760350e7 Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Thu, 29 Dec 2016 00:02:35 +0100 Subject: [PATCH 04/34] clarify - remove if () on initApp, use bool instead - win.show(true) actually has no effect - win.focus hack restored --- src/app/app.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/app.js b/src/app/app.js index 22b4572eae..8c532904b5 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -158,9 +158,9 @@ var initApp = function () { var mainWindow = new App.View.MainWindow(); // -m argument to open minimized to tray - if (nw.App.fullArgv.indexOf('-m') === -1) { - win.show(true); - } + var isStartMinimized = nw.App.fullArgv.indexOf('-m') !== -1; + + win.show(isStartMinimized); try { App.Window.show(mainWindow); @@ -634,6 +634,11 @@ if (nw.App.fullArgv.indexOf('-f') !== -1) { } // nwjs window events +win.on('focus', function () { //hack to make it somehow work + win.setAlwaysOnTop(true); + win.setAlwaysOnTop(Settings.alwaysOnTop); +}); + win.on('resize', function (width, height) { localStorage.width = Math.round(width); localStorage.height = Math.round(height); From 9a053333244f175574a735ec8e38a084ec9ffecb Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Thu, 29 Dec 2016 00:06:56 +0100 Subject: [PATCH 05/34] remove process check as requested --- src/app/app.js | 9 +++------ src/app/lib/views/title_bar.js | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/app.js b/src/app/app.js index 8c532904b5..82c0c5d720 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -661,18 +661,15 @@ win.on('minimize', function () { win.on('maximize', function () { localStorage.isMaximized = 1; - if (process.platform === 'win32') { - $('.os-max').addClass('os-is-max'); - } + $('.os-max').addClass('os-is-max'); }); win.on('restore', function () { if (Boolean(parseInt(localStorage.isMaximized))) { localStorage.isMaximized = 0; } - if (process.platform === 'win32') { - $('.os-max').removeClass('os-is-max'); - } + + $('.os-max').removeClass('os-is-max'); }); // Wipe the tmpFolder when closing the app (this frees up disk space) diff --git a/src/app/lib/views/title_bar.js b/src/app/lib/views/title_bar.js index 571413da2f..a232d4ac53 100644 --- a/src/app/lib/views/title_bar.js +++ b/src/app/lib/views/title_bar.js @@ -90,7 +90,7 @@ } }); - if (process.platform === 'win32' && Boolean(parseInt(localStorage.isMaximized))) { + if (Boolean(parseInt(localStorage.isMaximized))) { $('.os-max').addClass('os-is-max'); } } From b4d2e1f71b8d6ee732776c25a26d88d96266783f Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Thu, 29 Dec 2016 14:09:52 +0100 Subject: [PATCH 06/34] remove butter icon when poster are loaded on top --- src/app/lib/views/browser/item.js | 8 ++++++-- src/app/styl/views/browser/item.styl | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/lib/views/browser/item.js b/src/app/lib/views/browser/item.js index 477af06e35..f03d939393 100644 --- a/src/app/lib/views/browser/item.js +++ b/src/app/lib/views/browser/item.js @@ -18,6 +18,7 @@ ui: { covers: '.cover-imgs', + defaultCover: '.cover', bookmarkIcon: '.actions-favorites', watchedIcon: '.actions-watched' }, @@ -135,7 +136,7 @@ var posterCache = new Image(); posterCache.src = poster; - this.ui.covers.append(``); + this.ui.covers.append(`
`); posterCache.onload = function () { posterCache.onload = () => {}; @@ -149,11 +150,14 @@ posterCache.src = c.toDataURL(); } - this.ui.covers.children(-1).attr('src', posterCache.src).addClass('fadein'); + this.ui.covers.children(-1).css('background-image', 'url('+posterCache.src+')').addClass('fadein').delay(600).queue(_ => { + this.ui.defaultCover.addClass('empty'); + }); }.bind(this); posterCache.onerror = function (e) { this.ui.covers.empty(); + this.ui.defaultCover.removeClass('empty'); }.bind(this); }, diff --git a/src/app/styl/views/browser/item.styl b/src/app/styl/views/browser/item.styl index 52cd0403a0..b321b40854 100644 --- a/src/app/styl/views/browser/item.styl +++ b/src/app/styl/views/browser/item.styl @@ -20,11 +20,15 @@ border-radius: $PosterRadius box-shadow: $PosterShadow cursor: pointer + + &.empty + background-image none .cover-overlay - text-align center width 100% height 100% + background-size cover + background-position center position absolute transition opacity 500ms ease-in opacity 0 From f1be7d1841c0f0b480ed07f32414551e8ffffda8 Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Thu, 29 Dec 2016 20:13:44 +0100 Subject: [PATCH 07/34] hidpi win toolbar - assets will be set in artwork repo --- src/app/images/icons/topbar_sprite_win.png | Bin 237 -> 7105 bytes src/app/styl/views/title_bar.styl | 31 ++++++++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/app/images/icons/topbar_sprite_win.png b/src/app/images/icons/topbar_sprite_win.png index cec88dfc9f0a4d4a509aee95a173769c188392a1..dec48919300f4ec1aff0ff3d2de58034e7692479 100644 GIT binary patch literal 7105 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 C6kntO literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^3xHUFi5W<~$)0l>Nbv;tgt!7}v((KGoSm=VxEX(H zuNjcfSQ6wH%;50sMjDXQ@9E+gqH#Xifq7xU1}+wXq~-|4&;RXt7C!v{|B%Qn=AS%& zc;pvwy>2vGeQo_OR-=jRDq`J>Cj9)sn9{mBet#6}6pOl=mG j9rE^A%~&j;$HovUvBkainEz{_(-=Hm{an^LB{Ts5D;Zj+ diff --git a/src/app/styl/views/title_bar.styl b/src/app/styl/views/title_bar.styl index b810ada11a..e0d15dcd02 100644 --- a/src/app/styl/views/title_bar.styl +++ b/src/app/styl/views/title_bar.styl @@ -106,44 +106,43 @@ .btn-set.win32 background-size: auto auto - top: 6px - right: 3px + top: 1px + right: 1px .btn-os float: left - margin: 0 2px 0 0 - background: #000 + margin: 0 + background-color: transparent -webkit-border-radius: 0px border-radius: 0px border: 0 color: transparent display: inline-block font-size: 10px - height: 16px + height: 30px padding: 0 text-align: center - width: 20px + width: 45px cursor: pointer - background: url("../images/icons/topbar_sprite_win.png") + background-image: url("../images/icons/topbar_sprite_win.png") + background-size: cover -webkit-filter $PngLogo &.os-close - background-position -40px 0px + background-position -92px 0px &.os-max - background-position -20px 0px + background-position -46px 0px &.os-is-max - background-position -120px 0px + background-position 92px 0px &.os-min background-position 0px 0px &.os-close:hover - background-position -100px 0px + background-position 138px 0px -webkit-filter brightness(1) &.os-max:hover - background-position -80px 0px - -webkit-filter brightness(1) + background-position 184px 0px &.os-is-max:hover - background-position -140px 0px + background-position 46px 0px &.os-min:hover - background-position -60px 0px - -webkit-filter brightness(1) + background-position -138px 0px .btn-set.darwin From d29d72c3f5736bc28b21593018fdeb69953abdf2 Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Thu, 29 Dec 2016 21:46:52 +0100 Subject: [PATCH 08/34] re-add ghosts, done right - fixes #562 --- src/app/lib/views/browser/list.js | 10 +++++++++- src/app/lib/views/main_window.js | 4 ++++ src/app/styl/views/browser/item.styl | 5 +++++ src/app/styl/views/browser/list.styl | 1 - 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/app/lib/views/browser/list.js b/src/app/lib/views/browser/list.js index abe98c6883..783ae69aae 100644 --- a/src/app/lib/views/browser/list.js +++ b/src/app/lib/views/browser/list.js @@ -262,9 +262,9 @@ onLoaded: function () { App.vent.trigger('list:loaded'); - this.checkEmpty(); var self = this; this.addloadmore(); + this.addghosts(); if (typeof (this.ui.spinner) === 'object') { this.ui.spinner.hide(); @@ -298,6 +298,14 @@ } }, + addghosts: function () { + $('.ghost').remove(); + + for (var i = 0; i <= 10; i++) { // add 10 items + $('.items').append('
'); + } + }, + addloadmore: function () { var self = this; diff --git a/src/app/lib/views/main_window.js b/src/app/lib/views/main_window.js index d09b6d8f12..3774545073 100644 --- a/src/app/lib/views/main_window.js +++ b/src/app/lib/views/main_window.js @@ -511,6 +511,10 @@ '.item {', 'font-size: ' + fontSize + 'em;', + '}', + + '.ghost {', + 'width: ', postersWidth, 'px;', '}' ].join(''); diff --git a/src/app/styl/views/browser/item.styl b/src/app/styl/views/browser/item.styl index b321b40854..1edf3917fb 100644 --- a/src/app/styl/views/browser/item.styl +++ b/src/app/styl/views/browser/item.styl @@ -211,3 +211,8 @@ background-color:$ButtonBgHover &:active background-color:$ButtonBgActive + +.ghost + width 134px + height 0 + margin 10px \ No newline at end of file diff --git a/src/app/styl/views/browser/list.styl b/src/app/styl/views/browser/list.styl index 2c6461f529..7b470708c4 100644 --- a/src/app/styl/views/browser/list.styl +++ b/src/app/styl/views/browser/list.styl @@ -73,7 +73,6 @@ justify-content: space-between align-content: flex-start align-items: flex-start - justify-content: flex-start width: calc(100% - 5px) .error From 1d676dafbb71608d909eafe194bbf5234768e147 Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Fri, 30 Dec 2016 00:07:48 +0100 Subject: [PATCH 09/34] optimize for speed & less dom manipulations --- src/app/lib/views/browser/list.js | 33 +++++++++++++++------------- src/app/styl/views/browser/item.styl | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/app/lib/views/browser/list.js b/src/app/lib/views/browser/list.js index 783ae69aae..5fcac9fbf7 100644 --- a/src/app/lib/views/browser/list.js +++ b/src/app/lib/views/browser/list.js @@ -263,8 +263,8 @@ onLoaded: function () { App.vent.trigger('list:loaded'); var self = this; - this.addloadmore(); - this.addghosts(); + + this.completerow(); if (typeof (this.ui.spinner) === 'object') { this.ui.spinner.hide(); @@ -298,31 +298,34 @@ } }, - addghosts: function () { - $('.ghost').remove(); + completerow: function () { + var elms = this.addloadmore(); + elms += this.addghosts(); - for (var i = 0; i <= 10; i++) { // add 10 items - $('.items').append('
'); - } + $('.ghost, #load-more-item').remove(); + $('.items').append(elms); + + this.showloadmore(); + }, + + addghosts: function () { + return '
'; }, addloadmore: function () { - var self = this; + return '
' + i18n.__('Load More') + '
'; + }, - // maxResults to hide load-more on providers that return hasMore=true no matter what. - var currentPage = Math.ceil(this.collection.length / 50); - var maxResults = currentPage * 50; + showloadmore: function () { + var self = this; switch (App.currentview) { case 'movies': case 'shows': case 'anime': if ($('.items').children().last().attr('id') !== 'load-more-item') { - $('#load-more-item').remove(); if (this.collection.hasMore && !this.collection.filter.keywords && this.collection.state !== 'error' && this.collection.length !== 0) { - $('.items').append('
' + i18n.__('Load More') + '
'); - - $('#load-more-item').click(function () { + $('#load-more-item').css('display', 'inline-block').click(function () { $('#load-more-item').off('click'); self.collection.fetchMore(); }); diff --git a/src/app/styl/views/browser/item.styl b/src/app/styl/views/browser/item.styl index 1edf3917fb..64da6c6dad 100644 --- a/src/app/styl/views/browser/item.styl +++ b/src/app/styl/views/browser/item.styl @@ -167,7 +167,7 @@ border-radius 4px box-shadow $PosterShadow cursor pointer - display inline-block + display none margin 10px float left background-color:$BgColor1 From dd33b74139b95788633ae748bc7f72dbe284c749 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Fri, 30 Dec 2016 05:35:30 -0300 Subject: [PATCH 10/34] chore(package): update defer-request to version 0.0.3 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index afbfc28ba4..e3100024a9 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "async": "2.x.x", "bonjour": "^3.5.0", "chromecasts": "1.9.0", - "defer-request": "0.0.2", + "defer-request": "0.0.3", "dlnacasts": "0.1.0", "i18n": "0.x.x", "iconv-lite": "0.x.x", From eec5a57254860fd46f5fe39742b07daa13eaafc1 Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Fri, 30 Dec 2016 11:03:45 +0100 Subject: [PATCH 11/34] use str.repeat() --- src/app/lib/views/browser/list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/lib/views/browser/list.js b/src/app/lib/views/browser/list.js index 5fcac9fbf7..d7d51b83ac 100644 --- a/src/app/lib/views/browser/list.js +++ b/src/app/lib/views/browser/list.js @@ -309,7 +309,7 @@ }, addghosts: function () { - return '
'; + return '
'.repeat(10); }, addloadmore: function () { From 483c85f9872bc2e057d3eea548819d9f59bb5435 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Sun, 8 Jan 2017 14:12:38 -0300 Subject: [PATCH 12/34] chore(package): update trakt.tv to version 3.0.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3100024a9..2560f94872 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "tar": "2.2.1", "temp": "0.x.x", "webtorrent-health": "1.x.x", - "trakt.tv": "2.x.x", + "trakt.tv": "3.0.0", "trakt.tv-ondeck": "0.x.x", "trakt.tv-matcher": "1.x.x", "trakt.tv-images": "1.x.x", From 2a879be533398f64d552fe4684878ef0e36359fc Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Sun, 8 Jan 2017 20:11:41 +0100 Subject: [PATCH 13/34] fix providers not loading on master --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2560f94872..24aa2dc84d 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ }, "chromium-args": "--enable-node-worker", "dependencies": { - "butter-provider": "git+https://github.com/butterproviders/butter-provider", + "butter-provider": "0.6.0", "butter-provider-ccc": "git+https://github.com/butterproviders/butter-provider-ccc", "butter-provider-youtube": "git+https://github.com/butterproviders/butter-provider-youtube", "butter-provider-vodo": "git+https://github.com/butterproviders/butter-provider-vodo", From 3a051e7908933f88e4f9e5bb417c8fd3077a41f8 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Tue, 10 Jan 2017 14:48:03 -0300 Subject: [PATCH 14/34] chore(package): update trakt.tv to version 3.1.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 24aa2dc84d..54e26831ea 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "tar": "2.2.1", "temp": "0.x.x", "webtorrent-health": "1.x.x", - "trakt.tv": "3.0.0", + "trakt.tv": "3.1.0", "trakt.tv-ondeck": "0.x.x", "trakt.tv-matcher": "1.x.x", "trakt.tv-images": "1.x.x", From 0ab1938a69f4277ea9a36b08b8b1b06cd987759c Mon Sep 17 00:00:00 2001 From: vankasteelj Date: Thu, 9 Feb 2017 10:43:25 +0100 Subject: [PATCH 15/34] security fix: opensubs - xss protection for all srt files - use ssl with opensubs s --- src/app/lib/providers/opensubtitles.js | 3 ++- src/app/lib/vendor/videojshooks.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/lib/providers/opensubtitles.js b/src/app/lib/providers/opensubtitles.js index 5f596824c3..6d155485ac 100644 --- a/src/app/lib/providers/opensubtitles.js +++ b/src/app/lib/providers/opensubtitles.js @@ -7,7 +7,8 @@ openSRT = new OS({ useragent: Settings.opensubtitles.useragent + ' v' + (Settings.version || 1), username: Settings.opensubtitlesUsername, - password: Settings.opensubtitlesPassword + password: Settings.opensubtitlesPassword, + ssl: true }); }; diff --git a/src/app/lib/vendor/videojshooks.js b/src/app/lib/vendor/videojshooks.js index 42712ec6ed..986fec4392 100644 --- a/src/app/lib/vendor/videojshooks.js +++ b/src/app/lib/vendor/videojshooks.js @@ -284,6 +284,8 @@ vjs.TextTrack.prototype.load = function () { .replace(/(- |==|sync).*[\s\S].*[\s\S].*[\s\S].*[\s\S].*\.(com|org|net|edu)/ig, '') // various teams .replace(/[^0-9][\s\S][^0-9\W].*[\s\S].*[\s\S].*opensubtitles.*/ig, ''); // opensubs "contact us" ads + strings = Common.sanitize(strings); // xss-style attacks + strings = strings.replace(/--\>\;/g, '-->'); // restore srt format callback(strings); }; From 1b14e0ed4eca1bf135501db8407dad7aa3c4a7a2 Mon Sep 17 00:00:00 2001 From: Christian Kaisermann Date: Thu, 9 Feb 2017 12:16:31 -0200 Subject: [PATCH 16/34] Replaced "grunt" with "gulp" on readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7d829eb033..7b5d02e719 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Want to report a bug, request a feature, contribute to or translate Butter? Chec If you're comfortable getting up and running from a `git clone`, this method is for you. -After you clone the GitHub repository, you will need to build a number of assets using grunt. +After you clone the GitHub repository, you will need to build a number of assets using gulp. The [master](https://github.com/butterproject/butter-desktop) branch which contains the latest release. From 156af8fc80f152078e01bd078770de4b34184164 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Fri, 10 Feb 2017 19:23:29 -0300 Subject: [PATCH 17/34] chore(package): update trakt.tv to version 3.2.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54e26831ea..605fc79b95 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "tar": "2.2.1", "temp": "0.x.x", "webtorrent-health": "1.x.x", - "trakt.tv": "3.1.0", + "trakt.tv": "3.2.0", "trakt.tv-ondeck": "0.x.x", "trakt.tv-matcher": "1.x.x", "trakt.tv-images": "1.x.x", From a50c312f745396f42cc166957db13a3053da3a61 Mon Sep 17 00:00:00 2001 From: chtrinh Date: Mon, 6 Feb 2017 23:25:49 -0800 Subject: [PATCH 18/34] Increase maxBuffer size for parseReqDeps 'npm ls' stdout can execeed max buffer size of 200KB. Setting child process max buffer size to 500KB. --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 66768afb97..24056a06b4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -62,7 +62,7 @@ const parsePlatforms = () => { // returns an array of paths with the node_modules to include in builds const parseReqDeps = () => { return new Promise((resolve, reject) => { - exec('npm ls --production=true --parseable=true', (error, stdout, stderr) => { + exec('npm ls --production=true --parseable=true', {maxBuffer: 1024 * 500}, (error, stdout, stderr) => { if (error || stderr) { reject(error || stderr); } else { From d0b52cbcbe369a240340418e7f4036b02dc86bae Mon Sep 17 00:00:00 2001 From: chtrinh Date: Tue, 7 Feb 2017 19:07:06 -0800 Subject: [PATCH 19/34] Remove mouseScroll listner event `.bind()` returns a new function which is not referenced when trying to removed later. Saving bounded function as a property to be referenced. --- src/app/lib/views/player/player.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app/lib/views/player/player.js b/src/app/lib/views/player/player.js index 6ed6aa8323..4877286b76 100644 --- a/src/app/lib/views/player/player.js +++ b/src/app/lib/views/player/player.js @@ -36,12 +36,14 @@ this.listenTo(this.model, 'change:active_peers', this.updateActivePeers); this.listenTo(this.model, 'change:downloaded', this.updateDownloaded); - this.inFullscreen = win.isFullscreen; - this.playerWasReady = false; + this.inFullscreen = win.isFullscreen; + this.playerWasReady = false; - this.remaining = false; - this.createdRemaining = false; + this.remaining = false; + this.createdRemaining = false; this.firstPlay = true; + + this.boundedMouseScroll = this.mouseScroll.bind(this); }, isMovie: function () { @@ -403,7 +405,7 @@ customSubtitles: {}, progressTips: {} } - }).ready(function () { + }).ready(function () { that.playerWasReady = Date.now(); }); } @@ -779,7 +781,7 @@ } }); - $('body').bind('mousewheel', this.mouseScroll.bind(this)); + document.addEventListener('mousewheel', this.boundedMouseScroll); }, unbindKeyboardShortcuts: function () { @@ -850,7 +852,7 @@ // Change when mousetrap can be extended $('body').unbind('keydown'); - $('body').unbind('mousewheel'); + document.removeEventListener('mousewheel', this.boundedMouseScroll); }, toggleMouseDebug: function () { @@ -953,7 +955,7 @@ }, onDestroy: function () { - if (this.model.get('type') === 'video/youtube') { + if (this.model.get('type') === 'video/youtube') { $('.trailer_mouse_catch').remove(); // Trailer UI Show FIX/HACK } $('#player_drag').hide(); From e6cd59937a5305e4a70ada8a6e3db635c86119db Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Wed, 15 Feb 2017 16:29:00 -0300 Subject: [PATCH 20/34] chore(package): update trakt.tv to version 4.0.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 605fc79b95..6babc91f0a 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "tar": "2.2.1", "temp": "0.x.x", "webtorrent-health": "1.x.x", - "trakt.tv": "3.2.0", + "trakt.tv": "4.0.0", "trakt.tv-ondeck": "0.x.x", "trakt.tv-matcher": "1.x.x", "trakt.tv-images": "1.x.x", From 9382326d731233486e6c30f797c14a493376482d Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Wed, 15 Feb 2017 16:33:15 -0300 Subject: [PATCH 21/34] chore(package): update send to version 0.14.2 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6babc91f0a..c51dab21d4 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "rimraf": "2.x.x", "sanitizer": "0.x.x", "semver": "5.x.x", - "send": "0.14.1", + "send": "0.14.2", "strike-api": "0.2.0", "tar": "2.2.1", "temp": "0.x.x", From f2b5136dfd11c13d3d41c4e69341a18ddcead450 Mon Sep 17 00:00:00 2001 From: Jean van Kasteel Date: Wed, 15 Feb 2017 20:34:00 +0100 Subject: [PATCH 22/34] lib/providers/trakttv.js for trakt.tv > 4.x --- src/app/lib/providers/trakttv.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/lib/providers/trakttv.js b/src/app/lib/providers/trakttv.js index 2ce8df95b4..4daf8a5cfb 100644 --- a/src/app/lib/providers/trakttv.js +++ b/src/app/lib/providers/trakttv.js @@ -5,7 +5,11 @@ this.client = new Trakt({ client_id: Settings.trakttv.client_id, client_secret: Settings.trakttv.client_secret, - plugins: ['ondeck', 'matcher', 'images'], + plugins: { + ondeck: require('trakt.tv-ondeck'), + matcher: require('trakt.tv-matcher'), + images: require('trakt.tv-images') + }, options: { images: { smallerImages: true, From 771d7d7fbc9043fb3a4915cd53665222cbd1d572 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Sat, 18 Feb 2017 22:34:31 -0200 Subject: [PATCH 23/34] chore(package): update trakt.tv to version 5.0.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c51dab21d4..b18aff3383 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "tar": "2.2.1", "temp": "0.x.x", "webtorrent-health": "1.x.x", - "trakt.tv": "4.0.0", + "trakt.tv": "5.0.0", "trakt.tv-ondeck": "0.x.x", "trakt.tv-matcher": "1.x.x", "trakt.tv-images": "1.x.x", From 2468084a9c8d8e75c89374dce2346a1d1f15db68 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Sat, 18 Feb 2017 22:45:45 -0200 Subject: [PATCH 24/34] chore(package): update trakt.tv-ondeck to version 5.0.1 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b18aff3383..7729bd17f8 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "temp": "0.x.x", "webtorrent-health": "1.x.x", "trakt.tv": "5.0.0", - "trakt.tv-ondeck": "0.x.x", + "trakt.tv-ondeck": "5.0.1", "trakt.tv-matcher": "1.x.x", "trakt.tv-images": "1.x.x", "underscore": "1.x.x", From bc7edc10fc7ef5c0b3cba165f9dac68556473be4 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Sat, 18 Feb 2017 22:46:37 -0200 Subject: [PATCH 25/34] chore(package): update trakt.tv-matcher to version 5.0.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7729bd17f8..4ca7f2d44d 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "webtorrent-health": "1.x.x", "trakt.tv": "5.0.0", "trakt.tv-ondeck": "5.0.1", - "trakt.tv-matcher": "1.x.x", + "trakt.tv-matcher": "5.0.0", "trakt.tv-images": "1.x.x", "underscore": "1.x.x", "urijs": "1.x.x", From 23120a4e7a568884fefdd7996976a03981cbe131 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Sat, 18 Feb 2017 22:48:49 -0200 Subject: [PATCH 26/34] chore(package): update trakt.tv-images to version 5.0.0 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ca7f2d44d..adab6814b9 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "trakt.tv": "5.0.0", "trakt.tv-ondeck": "5.0.1", "trakt.tv-matcher": "5.0.0", - "trakt.tv-images": "1.x.x", + "trakt.tv-images": "5.0.0", "underscore": "1.x.x", "urijs": "1.x.x", "webtorrent": "^0.98.0" From 1cb1ce596a58fcd288c9a0300ba473a404b707a4 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Sun, 19 Feb 2017 08:01:57 -0300 Subject: [PATCH 27/34] chore(package): update trakt.tv to version 5.0.1 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index adab6814b9..c6f62bf218 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "tar": "2.2.1", "temp": "0.x.x", "webtorrent-health": "1.x.x", - "trakt.tv": "5.0.0", + "trakt.tv": "5.0.1", "trakt.tv-ondeck": "5.0.1", "trakt.tv-matcher": "5.0.0", "trakt.tv-images": "5.0.0", From fbbb1ac4475810bdf5103b8d55b756d001523494 Mon Sep 17 00:00:00 2001 From: Jean van Kasteel Date: Sun, 2 Apr 2017 20:40:35 +0200 Subject: [PATCH 28/34] correctly start minimized --- src/app/app.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/app.js b/src/app/app.js index 82c0c5d720..26d91cde11 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -160,7 +160,9 @@ var initApp = function () { // -m argument to open minimized to tray var isStartMinimized = nw.App.fullArgv.indexOf('-m') !== -1; - win.show(isStartMinimized); + if (!isStartMinimized) { + win.show(); + } try { App.Window.show(mainWindow); From 98f55cfcf7c431853c2256f3fd613dc89ae05446 Mon Sep 17 00:00:00 2001 From: Santiago Castro Date: Mon, 17 Apr 2017 05:23:03 -0300 Subject: [PATCH 29/34] Fix broken Markdown headings --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b5d02e719..6381be0846 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Keep track of Butter development and community activity. * Join in discussions on the [Butter Forum](https://www.reddit.com/r/ButterProject) * Connect with us on IRC at `#butterproject` on freenode ([web access](http://webchat.freenode.net/?channels=butterproject)) -##Screenshots +## Screenshots ![Butter](https://cloud.githubusercontent.com/assets/8317250/10714437/b1e1dc8c-7b32-11e5-9c25-d9fbd5b2f3bd.png) ![Debugging Butter](https://cloud.githubusercontent.com/assets/8317250/10714430/add70234-7b32-11e5-9be7-1de539d865ba.png) From 3533cfc42aae436f41a646e43d9d79c417e500dd Mon Sep 17 00:00:00 2001 From: Facundo Aita Date: Thu, 1 Jun 2017 16:04:08 -0300 Subject: [PATCH 30/34] Setting anchor to GitLab --- src/app/settings.js | 1 + src/app/templates/about.tpl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/settings.js b/src/app/settings.js index 3b90992669..5ba97f2ee5 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -2,6 +2,7 @@ var Settings = { projectName: 'Butter', projectUrl: 'http://butterproject.org', + projectGitLab: 'https://gitlab.com/butterproject', projectTwitter: 'butterproject', projectFacebook: 'ButterProjectOrg', projectGooglePlus: 'ButterProject', diff --git a/src/app/templates/about.tpl b/src/app/templates/about.tpl index 4ebb2ea436..45887f646c 100644 --- a/src/app/templates/about.tpl +++ b/src/app/templates/about.tpl @@ -24,7 +24,7 @@ - + @@ -36,6 +36,6 @@
<%=i18n.__("Changelog")%>
-
+
From c41a7c62c3caa7f7a321b6108b57ce865faec68d Mon Sep 17 00:00:00 2001 From: Facundo Aita Date: Thu, 1 Jun 2017 16:10:18 -0300 Subject: [PATCH 31/34] Setting tooltip to GitLab --- src/app/templates/about.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/templates/about.tpl b/src/app/templates/about.tpl index 45887f646c..4487c6f389 100644 --- a/src/app/templates/about.tpl +++ b/src/app/templates/about.tpl @@ -24,7 +24,7 @@ - + From 32f8d75aff2f454141299d3203a0fc4009d2e46f Mon Sep 17 00:00:00 2001 From: Facundo Aita Date: Mon, 5 Jun 2017 15:16:43 -0300 Subject: [PATCH 32/34] Changing gitlab for github Using github-icon to point to the github repository --- src/app/settings.js | 1 - src/app/styl/views/about.styl | 18 +++++++++--------- src/app/templates/about.tpl | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/app/settings.js b/src/app/settings.js index 5ba97f2ee5..3b90992669 100644 --- a/src/app/settings.js +++ b/src/app/settings.js @@ -2,7 +2,6 @@ var Settings = { projectName: 'Butter', projectUrl: 'http://butterproject.org', - projectGitLab: 'https://gitlab.com/butterproject', projectTwitter: 'butterproject', projectFacebook: 'ButterProjectOrg', projectGooglePlus: 'ButterProject', diff --git a/src/app/styl/views/about.styl b/src/app/styl/views/about.styl index a5c010e3c5..a3f3936d1e 100644 --- a/src/app/styl/views/about.styl +++ b/src/app/styl/views/about.styl @@ -9,7 +9,7 @@ background-image url('../images/bg-header.jpg') background-size cover background-position 50% 50% - + .margintop height calc(20% - 20px) @@ -60,7 +60,7 @@ margin 0 auto max-width 42em font-size 1em - + .full-text height 90px @@ -90,27 +90,27 @@ a.twitter_icon background url(../images/icons/icon-twitter.png) no-repeat center background-size contain - + a.facebook_icon background url(../images/icons/icon-facebook.png) no-repeat center background-size contain - + a.google_icon background url(../images/icons/icon-google.png) no-repeat center background-size contain - + a.stash_icon background url(../images/icons/icon-stash.png) no-repeat center background-size contain - a.gitlab_icon - background url(../images/icons/icon-gitlab.png) no-repeat center + a.github_icon + background url(../images/icons/icon-github.png) no-repeat center background-size contain a.blog_icon background url(../images/icons/icon-blog.png) no-repeat center background-size contain - + a.forum_icon background url(../images/icons/icon-discourse.png) no-repeat center background-size contain @@ -150,4 +150,4 @@ margin 0 auto margin-top 2vh padding 0px 15px - scrollable() \ No newline at end of file + scrollable() diff --git a/src/app/templates/about.tpl b/src/app/templates/about.tpl index 4487c6f389..7b5d940903 100644 --- a/src/app/templates/about.tpl +++ b/src/app/templates/about.tpl @@ -24,7 +24,7 @@ - + From 7bdf46d3eba1d07baac89dc710c0a4cca48db85a Mon Sep 17 00:00:00 2001 From: Niv Sardi Date: Tue, 6 Jun 2017 13:28:23 -0300 Subject: [PATCH 33/34] XXX: re-add gitlab icon to CSS Signed-off-by: Niv Sardi --- src/app/styl/views/about.styl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/styl/views/about.styl b/src/app/styl/views/about.styl index a3f3936d1e..4f19cf8973 100644 --- a/src/app/styl/views/about.styl +++ b/src/app/styl/views/about.styl @@ -107,6 +107,10 @@ background url(../images/icons/icon-github.png) no-repeat center background-size contain + a.gitlab_icon + background url(../images/icons/icon-gitlab.png) no-repeat center + background-size contain + a.blog_icon background url(../images/icons/icon-blog.png) no-repeat center background-size contain From d74a54aeccf9cad45d697a7819ca680bcea2d8ed Mon Sep 17 00:00:00 2001 From: Niv Sardi Date: Tue, 6 Jun 2017 13:34:48 -0300 Subject: [PATCH 34/34] XXX: support for both gitlab and github depending on matching 'github.com' in the sourceUrl key Signed-off-by: Niv Sardi --- src/app/templates/about.tpl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/templates/about.tpl b/src/app/templates/about.tpl index 7b5d940903..160717fdd9 100644 --- a/src/app/templates/about.tpl +++ b/src/app/templates/about.tpl @@ -1,3 +1,11 @@ +<% +if(Settings.sourceUrl.match('github.com')){ + source_icon = 'github_icon' +} else { + source_icon = 'gitlab_icon' +}; +%> +
@@ -24,7 +32,7 @@ - +