From 267404563a6c67f4834f27e86fd89ec868528922 Mon Sep 17 00:00:00 2001 From: horchi Date: Fri, 9 Mar 2018 21:30:13 +0100 Subject: 2018-03-08: version 1.1.136 (rechner)\n - added: if repeatFields shorttext checked, title is also checked and disabled\n - removed: description field in repeatFields\n - added: parameter osdTimerNotify\n \n --- http/src/js/1_main.js | 1 + http/src/js/5_timerDialog.js | 12 +++++++++--- http/src/js/pages.profile.js | 34 ++++++++++++++++++---------------- http/src/lang/de.js | 4 +++- 4 files changed, 31 insertions(+), 20 deletions(-) (limited to 'http/src') diff --git a/http/src/js/1_main.js b/http/src/js/1_main.js index 8c7d689..fc16403 100644 --- a/http/src/js/1_main.js +++ b/http/src/js/1_main.js @@ -19,6 +19,7 @@ epgd.userProfile_defaults = { pickerFirstDay: '6', quickTimes: '', startWithSched: 0, + osdTimerNotify: 0, startPage: "menu_options", namingModeSerie: "0", namingModeSearchSerie: "0", diff --git a/http/src/js/5_timerDialog.js b/http/src/js/5_timerDialog.js index 113e7a9..7ee729b 100644 --- a/http/src/js/5_timerDialog.js +++ b/http/src/js/5_timerDialog.js @@ -364,7 +364,7 @@ epgd.searchTimerDialog.prototype.create = function () { + '
' + '   
' - + '
' + [""].concat(trS.searchFields).join('') + '
' + + '
' + [" "].concat(trS.searchFields).join('') + '
' + '
' + '' + tr.episode + ' ' + '' + epgd.tr.pages.eventDetail.season + ' ' @@ -376,7 +376,7 @@ epgd.searchTimerDialog.prototype.create = function () { + '
' + tr.noEpgMatch + '
' + '
' + [""].concat(trS.searchFields).join('') + '
' + + tr.noRepeat + epgd.pages.help.getIcon('sTRepeat') + '
' + [""].concat(trS.repeatFields).join('') + '
' + '
' + epgd.pages.help.getIcon('sTChannels') + '
' @@ -390,6 +390,12 @@ epgd.searchTimerDialog.prototype.create = function () { $([form.tTime, form.tRepeat, form.tAdv]).change(function () { $(this).parent().next().toggle(this.checked); }); + $(form.tRFields).change(function () { + if (this.checked) + $(this).prev().prop("disabled", true).prop("checked", true).change(); + else + $(this).prev().prop("disabled", false) + }); $([form.tSFSeason, form.tSFSPart, form.tSFYear]).change(function () { this.value = this.value.replace(/[^0-9-]/g, ''); if (this.value.length == 1 && this.value == '-') @@ -424,7 +430,7 @@ epgd.searchTimerDialog.prototype.render = function (t) { form.tRFields[i].checked = (d & f); form.tRepeat.checked = d > 0; $(form.tRepeat).change(); - + $(form.tRFields).change(); form.tSFEpisode.value = t.episodename || ''; form.tSFSeason.value = t.season || ''; form.tSFSPart.value = t.seasonpart || ''; diff --git a/http/src/js/pages.profile.js b/http/src/js/pages.profile.js index 87bbc1b..08e02bf 100644 --- a/http/src/js/pages.profile.js +++ b/http/src/js/pages.profile.js @@ -42,6 +42,7 @@ epgd.pages.profile = { + '' + epgd.tr.advanced + '' + 'VDR OSD' + '' + epgd.tr.pages.profile.vdr.startWithSched + '' + + '' + epgd.tr.pages.profile.vdr.osdTimerNotify + '' + '' + epgd.tr.menu.records + '' + '' + epgd.tr.pages.profile.record.subFolderSort + '' + ''; @@ -117,23 +118,23 @@ epgd.pages.profile = { this.form.namingModeMovie.selectedIndex = epgd.profile.namingModeMovie; this.form.namingModeSearchMovie.selectedIndex = epgd.profile.namingModeSearchMovie; - $([this.form.namingModeSerie,this.form.namingModeSearchSerie,this.form.namingModeMovie,this.form.namingModeSearchMovie] ).change(function () { - this.nextSibling.style.display = (this.selectedIndex == 6) ? 'block' : 'none'; + $([this.form.namingModeSerie,this.form.namingModeSearchSerie,this.form.namingModeMovie,this.form.namingModeSearchMovie] ).change(function () { + this.nextSibling.style.display = (this.selectedIndex == 6) ? 'block' : 'none'; }).change(); epgd.utils.addPlaceholders(this.form.namingModeSerieTemplate, '%', epgd.tr.pages.timerList.templateFields); epgd.utils.addPlaceholders(this.form.namingModeSearchSerieTemplate, '%', epgd.tr.pages.timerList.templateFields); epgd.utils.addPlaceholders(this.form.namingModeMovieTemplate, '%', epgd.tr.pages.timerList.templateFields); epgd.utils.addPlaceholders(this.form.namingModeSearchMovieTemplate, '%', epgd.tr.pages.timerList.templateFields); - $(this.form.quickTimes).one("focus", function () { - var quickTimes = this; - epgd.ajax({ url: epgd.login.url + "data/searchtimers?type=S" }, function (data) { - var placeholders = { "@Now": ": current time", "@Next": ": next event" }; - $.each(data.searchtimers, function (id, t) { - placeholders['@' + t.name || t.expression] = ': saved timer'; - }); - epgd.utils.addPlaceholders(quickTimes, '@', placeholders); - }); + $(this.form.quickTimes).one("focus", function () { + var quickTimes = this; + epgd.ajax({ url: epgd.login.url + "data/searchtimers?type=S" }, function (data) { + var placeholders = { "@Now": ": current time", "@Next": ": next event" }; + $.each(data.searchtimers, function (id, t) { + placeholders['@' + t.name || t.expression] = ': saved timer'; + }); + epgd.utils.addPlaceholders(quickTimes, '@', placeholders); + }); }); this.form.searchAdv.checked = epgd.profile.searchAdv == "1"; @@ -161,6 +162,7 @@ epgd.pages.profile = { checkData({ name: "defaultVDRuuid", value: $(form.defaultVDRuuid).val() || '', owner: owner }); checkData({ name: "quickTimes", value: form.quickTimes.value.replace(/\n/g, '~'), owner: owner }); checkData({ name: "startWithSched", value: $(form.startWithSched).prop('checked') ? "1" : "0", owner: owner }); + checkData({ name: "osdTimerNotify", value: $(form.osdTimerNotify).prop('checked') ? "1" : "0", owner: owner }); checkData({ name: "pickerFirstDay", value: new String(form.pickerFirstDay.selectedIndex), owner: owner }); checkData({ name: "startPage", value: $(form.startPage).val() || '', owner: owner }); checkData({ name: "namingModeSerie", value: new String(this.form.namingModeSerie.selectedIndex), owner: owner }); @@ -239,13 +241,13 @@ epgd.pages.profile = { } return true; }, - checkRegex: function (input) { - if (input.getAttribute('data-valexp') && !new RegExp(input.getAttribute('data-valexp')).test(input.value)) { + checkRegex: function (input) { + if (input.getAttribute('data-valexp') && !new RegExp(input.getAttribute('data-valexp')).test(input.value)) { input.focus(); epgd.utils.popup(epgd.tr.error.invalid); - return false; - } - return true; + return false; + } + return true; } } }; diff --git a/http/src/lang/de.js b/http/src/lang/de.js index 5ba75b7..0cf1c12 100644 --- a/http/src/lang/de.js +++ b/http/src/lang/de.js @@ -226,6 +226,7 @@ epgd.tr = { caseSensitive: "Klein-/Großschreibung", searchModes: ["exakte Übereinstimmung", "regulärer Ausdruck", "Muster", "enthalten in"], searchFields: ["Titel", "Kurztext", "Beschreibung"], + repeatFields: ["Titel", "Kurztext"], empty: "Leider nichts gefunden.", matchdensity: "Treffergenauigkeit" }, @@ -260,7 +261,8 @@ epgd.tr = { label: "epgd Backend" }, vdr: { - startWithSched:'EPG Menü startet mit Schedule' + startWithSched:'EPG Menü startet mit Schedule', + osdTimerNotify:'Info anzeigen, wenn der VDR einen Timer übernommen hat' }, record: { subFolderSort: 'Sortierung der Unterordner' -- cgit v1.2.3