diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index c520dfe78..bfc1a7215 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -15,12 +15,12 @@
},
"devDependencies": {},
"ignore": [],
- "version": "1.0.77",
- "_release": "1.0.77",
+ "version": "1.0.79",
+ "_release": "1.0.79",
"_resolution": {
"type": "version",
- "tag": "1.0.77",
- "commit": "68a71ffeed9dad3e3d06d163b51ae4c555f3c1f9"
+ "tag": "1.0.79",
+ "commit": "f00dd984581d53272229de71458c8a8f6b5878fc"
},
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.0.0",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
index 8e5b525c5..25fec50fd 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
@@ -32,8 +32,20 @@ define(['paperdialoghelper', 'layoutManager', 'globalize', 'dialogText', 'html!.
html += '';
}
+ if (options.title) {
+ html += '';
+ html += options.title;
+ html += '
';
+ }
+
html += '';
+ if (options.description) {
+ html += '';
+ html += options.description;
+ html += '
';
+ }
+
// TODO: An actual form element should probably be added
html += '
';
if (raisedButtons) {
@@ -53,8 +65,8 @@ define(['paperdialoghelper', 'layoutManager', 'globalize', 'dialogText', 'html!.
dlg.querySelector('.txtPromptValue').value = options.text;
}
- if (options.title) {
- dlg.querySelector('.txtPromptValue').label = options.title;
+ if (options.label) {
+ dlg.querySelector('.txtPromptValue').label = options.label;
}
document.body.appendChild(dlg);
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js
index 8998f6ae5..6eb4ef6f3 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@@ -228,7 +228,7 @@
require(['prompt'], function (prompt) {
prompt({
- title: 'Value:'
+ label: 'Value:'
}).then(function (text) {
var list = $(source).parents('.editableListviewContainer').find('.paperList');
var items = editableListViewValues(list);
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 3a1217912..2c3f6bfc5 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -72,17 +72,16 @@
require(['prompt'], function (prompt) {
prompt({
- title: Globalize.translate('LabelNewName'),
- callback: function (newName) {
+ label: Globalize.translate('LabelNewName')
- if (newName && newName != virtualFolder.Name) {
+ }).then(function (newName) {
+ if (newName && newName != virtualFolder.Name) {
- var refreshAfterChange = shouldRefreshLibraryAfterChanges(page);
+ var refreshAfterChange = shouldRefreshLibraryAfterChanges(page);
- ApiClient.renameVirtualFolder(virtualFolder.Name, newName, refreshAfterChange).then(function () {
- reloadLibrary(page);
- });
- }
+ ApiClient.renameVirtualFolder(virtualFolder.Name, newName, refreshAfterChange).then(function () {
+ reloadLibrary(page);
+ });
}
});
diff --git a/dashboard-ui/scripts/serversecurity.js b/dashboard-ui/scripts/serversecurity.js
index e675c548c..93d3b7ed6 100644
--- a/dashboard-ui/scripts/serversecurity.js
+++ b/dashboard-ui/scripts/serversecurity.js
@@ -95,28 +95,33 @@
});
}
- function onSubmit() {
- var form = this;
- var page = $(form).parents('.page');
+ function showNewKeyPrompt(page) {
+ require(['prompt'], function (prompt) {
+
+ // HeaderNewApiKeyHelp not used
- Dashboard.showLoadingMsg();
+ prompt({
+ title: Globalize.translate('HeaderNewApiKey'),
+ label: Globalize.translate('LabelAppName'),
+ description: Globalize.translate('LabelAppNameExample')
- ApiClient.ajax({
- type: "POST",
- url: ApiClient.getUrl('Auth/Keys', {
+ }).then(function (value) {
- App: $('#txtAppName', form).val()
+ ApiClient.ajax({
+ type: "POST",
+ url: ApiClient.getUrl('Auth/Keys', {
- })
+ App: value
- }).then(function () {
+ })
- $('.newKeyPanel', page).panel('close');
+ }).then(function () {
+
+ loadData(page);
+ });
+ });
- loadData(page);
});
-
- return false;
}
pageIdOn('pageinit', "serverSecurityPage", function () {
@@ -125,14 +130,10 @@
$('.btnNewKey', page).on('click', function () {
- $('.newKeyPanel', page).panel('toggle');
-
- $('#txtAppName', page).val('').focus();
+ showNewKeyPrompt(page);
});
- $('.newKeyForm').off('submit', onSubmit).on('submit', onSubmit);
-
});
pageIdOn('pagebeforeshow', "serverSecurityPage", function () {
diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index ee8006781..fe11ff848 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -343,7 +343,7 @@
require(['prompt'], function (prompt) {
prompt({
- title: Globalize.translate('LabelTag')
+ label: Globalize.translate('LabelTag')
}).then(function (value) {
var tags = getBlockedTagsFromPage(page);
diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html
index 9d301b38f..529869902 100644
--- a/dashboard-ui/serversecurity.html
+++ b/dashboard-ui/serversecurity.html
@@ -4,7 +4,7 @@
${TitleAdvanced}
-