diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 1d60656c48..33672cf5fe 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.326", - "_release": "1.4.326", + "version": "1.4.327", + "_release": "1.4.327", "_resolution": { "type": "version", - "tag": "1.4.326", - "commit": "2f0db5f0b27eccd17c1a451bde9ae537d083a89d" + "tag": "1.4.327", + "commit": "93885cc5aa03632b087a477b0d01612d106ee36f" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js index 6bd0f56953..c0e6aee2c1 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.js @@ -3,9 +3,9 @@ var currentDialog; var recordingDeleted = false; - var recordingUpdated = false; var currentItemId; var currentServerId; + var currentResolve; function deleteTimer(apiClient, timerId) { @@ -44,10 +44,7 @@ apiClient.getLiveTvTimer(currentItemId).then(function (item) { item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60; item.PostPaddingSeconds = form.querySelector('#txtPostPaddingMinutes').value * 60; - apiClient.updateLiveTvTimer(item).then(function () { - recordingUpdated = true; - closeDialog(false); - }); + apiClient.updateLiveTvTimer(item).then(currentResolve); }); e.preventDefault(); @@ -95,6 +92,7 @@ currentServerId = serverId; loading.show(); options = options || {}; + currentResolve = resolve; require(['text!./recordingeditor.template.html'], function (template) { @@ -124,21 +122,26 @@ dlg.innerHTML = html; - if (!options.enableCancel) { - dlg.querySelector('.btnCancelRecording').classList.add('hide'); + if (options.enableCancel === false) { + dlg.querySelector('.formDialogFooter').classList.add('hide'); } currentDialog = dlg; + dlg.addEventListener('closing', function () { + + if (!recordingDeleted) { + dlg.querySelector('.btnSubmit').click(); + } + }); + dlg.addEventListener('close', function () { - if (recordingDeleted || recordingUpdated) { + if (recordingDeleted) { resolve({ - updated: recordingUpdated, - deleted: recordingDeleted + updated: true, + deleted: true }); - } else { - reject(); } }); diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html index dfa1754adf..ce0d6316c8 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html @@ -33,7 +33,7 @@
-