diff options
Diffstat (limited to 'http/src/js/pages.profile.js')
| -rw-r--r-- | http/src/js/pages.profile.js | 34 |
1 files changed, 18 insertions, 16 deletions
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 = { + '<tr><td>' + epgd.tr.advanced + '</td><td><input type="checkbox" id="searchAdv" /></td></tr>' + '<tr><th colspan="2">VDR OSD</th><tr>' + '<tr><td>' + epgd.tr.pages.profile.vdr.startWithSched + '</td><td><input type="checkbox" id="startWithSched"' + (epgd.profile.startWithSched == "1" ? ' checked="checked"' : '') + ' /></td></tr>' + + '<tr><td>' + epgd.tr.pages.profile.vdr.osdTimerNotify + '</td><td><input type="checkbox" id="osdTimerNotify"' + (epgd.profile.osdTimerNotify == "1" ? ' checked="checked"' : '') + ' /></td></tr>' + '<tr><th colspan="2">' + epgd.tr.menu.records + '</th><tr>' + '<tr><td>' + epgd.tr.pages.profile.record.subFolderSort + '</td><td><select id="recordSubFolderSort"><option value="1">' + epgd.tr.pages.eventDetail.title + ' up</option><option value="2">' + epgd.tr.pages.eventDetail.title + ' down</option><option value="3">' + epgd.tr.pages.timerList.folder + ' up</option><option value="4">' + epgd.tr.pages.timerList.folder + ' down</option><option value="5">' + epgd.tr.pages.timerList.recordTime + ' up</option><option value="6">' + epgd.tr.pages.timerList.recordTime + ' down</option></select></td></tr>' + '</table></div>'; @@ -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; } } }; |