Skip to content

Commit

Permalink
https://github.com/zacny/voddownloader/issues/26
Browse files Browse the repository at this point in the history 
#28
  • Loading branch information
@zacny
zacny committed Dec 20, 2020
1 parent c241c9c commit 29105e7
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 85 deletions.
2 changes: 1 addition & 1 deletion dist/voddownloader.meta.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ==UserScript==
// @name Skrypt umożliwiający pobieranie materiałów ze znanych serwisów VOD.
// @version 5.11.0
// @version 5.11.1
// @updateURL https://raw.githubusercontent.com/zacny/voddownloader/master/dist/voddownloader.meta.js
// @downloadURL https://raw.githubusercontent.com/zacny/voddownloader/master/dist/voddownloader.user.js
// @description Skrypt służący do pobierania materiałów ze znanych serwisów VOD.
Expand Down
59 changes: 20 additions & 39 deletions dist/voddownloader.user.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ==UserScript==
// @name Skrypt umożliwiający pobieranie materiałów ze znanych serwisów VOD.
// @version 5.11.0
// @version 5.11.1
// @updateURL https://raw.githubusercontent.com/zacny/voddownloader/master/dist/voddownloader.meta.js
// @downloadURL https://raw.githubusercontent.com/zacny/voddownloader/master/dist/voddownloader.user.js
// @description Skrypt służący do pobierania materiałów ze znanych serwisów VOD.
Expand Down Expand Up @@ -144,12 +144,6 @@
caption: 'Zbyt długi czas odpowiedzi.',
template: Tool.template`Dla kroku asychronicznego z indeksem: ${0} na stronie "${1}" nie dotarły \
informacje zwrotne.\nPrzypuszczalnie jest to problem sieciowy. Spróbuj ponownie za jakiś czas.`
},
noParent: {
caption: 'Brak zakładki ze stroną główną.',
template: Tool.template`Została zamknięta zakładka ze stroną na której został uruchomiony skrypt. \
Ta zakładka nie może przez to działać poprawnie. Otwórz ponownie stronę główną: \n${0}\n
by przywrócić prawidłowe funkcjonowanie skryptu.`
}
}
};
Expand Down Expand Up @@ -340,7 +334,7 @@

DomTamper.handleError = function(exception, w){
if(w === undefined){
w = window.open('', 'voddownloader-results');
w = window.open();
}

prepareHead(w);
Expand Down Expand Up @@ -395,25 +389,11 @@

DomTamper.createLoader = function(w){
prepareHead(w);
var extraContent = createLoaderContent();
var pageContent = createPageContent(extraContent);
var pageContent = $('<div>').addClass('page-content');
pageContent.append(createLoaderContent());
pageContent.append(createBugReportLink(w, 'special-color white-text'));
prepareBody(w, pageContent);
ParentUnloader.init();
};

var createPageContent = function(extraContent){
var pageContent = $('<div>').addClass('page-content');
var parentExist = $('<div>').attr('id', 'parent-exist');
var parentNotExist = $('<div>').attr('id', 'parent-not-exist').append(
createErrorContent(getErrorData(new Exception(config.error.noParent, window.location.href)))
).addClass('do-not-display');

parentExist.append(extraContent);
pageContent.append(parentNotExist);
pageContent.append(parentExist);

return pageContent;
Unloader.init(w);
};

var createLoaderContent = function(){
Expand Down Expand Up @@ -511,12 +491,12 @@

prepareHead(w);
setWindowTitle(data, w);
var extraContent = createTable(data, w);
var pageContent = createPageContent(extraContent);
var pageContent = $('<div>').addClass('page-content');
pageContent.append(createTable(data, w));
pageContent.append(createBugReportLink(w, 'special-color white-text'));
pageContent.append(createNotificationContainer());
prepareBody(w, pageContent, true);
ParentUnloader.init();
Unloader.init(w);
};
var createNotificationContainer = function(){
return $('<div>').attr('id', 'notification-container')
Expand Down Expand Up @@ -597,7 +577,7 @@
Executor.asyncChain = function(service, options, w){
try {
if(w === undefined){
w = window.open('', 'voddownloader-results');
w = window.open();
DomTamper.createLoader(w);
}

Expand Down Expand Up @@ -716,19 +696,20 @@
return WrapperDetector;
}(WrapperDetector || {}));

var ParentUnloader = (function(ParentUnloader) {
var Unloader = (function(Unloader) {
var win;

ParentUnloader.init = function(){
Unloader.init = function(w){
win = w;
$(window).bind('beforeunload', function(){
var w = window.open('', 'voddownloader-results');
$('#parent-exist', w.document.body).addClass('do-not-display');
$('#parent-not-exist', w.document.body).removeClass('do-not-display');
$('#bug-report-button', w.document.body).removeClass('special-color white-text').addClass('btn-danger');
if(!win.closed) {
win.close();
}
});
};

return ParentUnloader;
}(ParentUnloader || {}));
return Unloader;
}(Unloader || {}));

var VOD_TVP = (function(VOD_TVP) {
var properties = Configurator.setup({
Expand Down Expand Up @@ -1261,7 +1242,7 @@
});

var clickButton = function(){
var w = window.open('', 'voddownloader-results');
var w = window.open();
try {
var url = $("video.pb-video-player").attr('src');
if(url !== undefined){
Expand Down Expand Up @@ -1339,7 +1320,7 @@
};

var clickButton = function(){
var w = window.open('', 'voddownloader-results');
var w = window.open();
try {
var videoPlayer = $('#videoPlayer').data('player-setup');
var sources = (videoPlayer || {}).sources || {};
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function utilPartAttach() {
.pipe(order([
'exception.js', 'format.js', 'tool.js', 'config.js', 'asyncStep.js', 'notification.js',
'pluginSettingsDetector.js', 'domTamper.js', 'executor.js', 'configurator.js', 'changeVideoDetector.js',
'wrapperDetector.js', 'parentUnloader.js'
'wrapperDetector.js', 'unloader.js'
]))
.pipe(concat('utils.js'))
.pipe(gulp.dest(config.tmp_dir));
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "voddownloader",
"version": "5.11.0",
"version": "5.11.1",
"description": "test",
"main": "src/index.js",
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/source/cda.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var CDA = (function(CDA) {
});

var clickButton = function(){
var w = window.open('', 'voddownloader-results');
var w = window.open();
try {
var url = $("video.pb-video-player").attr('src');
if(url !== undefined){
Expand Down
2 changes: 1 addition & 1 deletion src/source/ninateka.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var NINATEKA = (function(NINATEKA) {
};

var clickButton = function(){
var w = window.open('', 'voddownloader-results');
var w = window.open();
try {
var videoPlayer = $('#videoPlayer').data('player-setup');
var sources = (videoPlayer || {}).sources || {};
Expand Down
6 changes: 0 additions & 6 deletions src/util/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ const config = {
caption: 'Zbyt długi czas odpowiedzi.',
template: Tool.template`Dla kroku asychronicznego z indeksem: ${0} na stronie "${1}" nie dotarły \
informacje zwrotne.\nPrzypuszczalnie jest to problem sieciowy. Spróbuj ponownie za jakiś czas.`
},
noParent: {
caption: 'Brak zakładki ze stroną główną.',
template: Tool.template`Została zamknięta zakładka ze stroną na której został uruchomiony skrypt. \
Ta zakładka nie może przez to działać poprawnie. Otwórz ponownie stronę główną: \n${0}\n
by przywrócić prawidłowe funkcjonowanie skryptu.`
}
}
};
Expand Down
28 changes: 7 additions & 21 deletions src/util/domTamper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var DomTamper = (function(DomTamper){

DomTamper.handleError = function(exception, w){
if(w === undefined){
w = window.open('', 'voddownloader-results');
w = window.open();
}

prepareHead(w);
Expand Down Expand Up @@ -117,25 +117,11 @@ var DomTamper = (function(DomTamper){

DomTamper.createLoader = function(w){
prepareHead(w);
var extraContent = createLoaderContent();
var pageContent = createPageContent(extraContent);
var pageContent = $('<div>').addClass('page-content');
pageContent.append(createLoaderContent());
pageContent.append(createBugReportLink(w, 'special-color white-text'));
prepareBody(w, pageContent);
ParentUnloader.init();
};

var createPageContent = function(extraContent){
var pageContent = $('<div>').addClass('page-content');
var parentExist = $('<div>').attr('id', 'parent-exist');
var parentNotExist = $('<div>').attr('id', 'parent-not-exist').append(
createErrorContent(getErrorData(new Exception(config.error.noParent, window.location.href)))
).addClass('do-not-display');

parentExist.append(extraContent);
pageContent.append(parentNotExist);
pageContent.append(parentExist);

return pageContent;
Unloader.init(w);
};

var createLoaderContent = function(){
Expand Down Expand Up @@ -233,12 +219,12 @@ var DomTamper = (function(DomTamper){

prepareHead(w);
setWindowTitle(data, w);
var extraContent = createTable(data, w);
var pageContent = createPageContent(extraContent);
var pageContent = $('<div>').addClass('page-content');
pageContent.append(createTable(data, w));
pageContent.append(createBugReportLink(w, 'special-color white-text'));
pageContent.append(createNotificationContainer());
prepareBody(w, pageContent, true);
ParentUnloader.init();
Unloader.init(w);
};
var createNotificationContainer = function(){
return $('<div>').attr('id', 'notification-container')
Expand Down
2 changes: 1 addition & 1 deletion src/util/executor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var Executor = (function(Executor){
Executor.asyncChain = function(service, options, w){
try {
if(w === undefined){
w = window.open('', 'voddownloader-results');
w = window.open();
DomTamper.createLoader(w);
}

Expand Down
13 changes: 0 additions & 13 deletions src/util/parentUnloader.js
View file

This file was deleted.

14 changes: 14 additions & 0 deletions src/util/unloader.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
var Unloader = (function(Unloader) {
var win;

Unloader.init = function(w){
win = w;
$(window).bind('beforeunload', function(){
if(!win.closed) {
win.close();
}
});
};

return Unloader;
}(Unloader || {}));

0 comments on commit 29105e7

Please sign in to comment.