milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update dialogs

Browse source
This commit is contained in:
Luke Pulverenti 2016-04-09 22:27:09 -04:00
parent 89e6609ffa
commit de40062c03
7 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.2.8", "version": "1.2.9",
"_release": "1.2.8", "_release": "1.2.9",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.2.8", "tag": "1.2.9",
"commit": "ab69b1f6c75888a55b4baa100f2d3c527633bf49" "commit": "987b1f5f79a5d31f5c2a94077f7cf0cdd94eaac4"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

6
dashboard-ui/bower_components/emby-webcomponents/alert/alert.js vendored
View file

@ -44,7 +44,9 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.h
html += '</h2>'; html += '</h2>';
} }
if (options.text) { var text = options.html || options.text;
if (text) {
if (options.title) { if (options.title) {
html += '<p style="margin-top:2em;">'; html += '<p style="margin-top:2em;">';
@ -52,7 +54,7 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.h
html += '<p>'; html += '<p>';
} }
html += options.text; html += text;
html += '</p>'; html += '</p>';
} }

6
dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js vendored
View file

@ -66,8 +66,10 @@ define(['layoutManager', 'dialogText'], function (layoutManager, dialogText) {
html += '<h2>' + options.title + '</h2>'; html += '<h2>' + options.title + '</h2>';
} }
if (options.text) { var text = options.html || options.text;
html += '<div>' + options.text + '</div>';
if (text) {
html += '<div>' + text + '</div>';
} }
html += '<div class="buttons">'; html += '<div class="buttons">';

7
dashboard-ui/bower_components/emby-webcomponents/router.js vendored
View file

@ -69,7 +69,12 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
case MediaBrowser.ConnectionState.ServerUpdateNeeded: case MediaBrowser.ConnectionState.ServerUpdateNeeded:
{ {
require(['alert'], function (alert) { require(['alert'], function (alert) {
alert(Globalize.translate('core#ServerUpdateNeeded', '<a href="https://emby.media">https://emby.media</a>')).then(function () { alert({
text: Globalize.translate('core#ServerUpdateNeeded', 'https://emby.media'),
html: Globalize.translate('core#ServerUpdateNeeded', '<a href="https://emby.media">https://emby.media</a>')
}).then(function () {
embyRouter.showSelectServer(); embyRouter.showSelectServer();
}); });
}); });

6
dashboard-ui/bower_components/iron-icon/.bower.json vendored
View file

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/iron-icon", "homepage": "https://github.com/PolymerElements/iron-icon",
"_release": "1.0.8", "_release": "1.0.8",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.8", "tag": "v1.0.8",
"commit": "f36b38928849ef3853db727faa8c9ef104d611eb" "commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
}, },
"_source": "git://github.com/polymerelements/iron-icon.git", "_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon" "_originalSource": "PolymerElements/iron-icon"
} }

9
dashboard-ui/scripts/selectserver.js
View file

@ -26,9 +26,12 @@
break; break;
case MediaBrowser.ConnectionState.ServerUpdateNeeded: case MediaBrowser.ConnectionState.ServerUpdateNeeded:
{ {
Dashboard.alert({ Dashboard.alert(alert({
message: Globalize.translate('ServerUpdateNeeded', '<a href="https://emby.media">https://emby.media</a>')
}); text: Globalize.translate('core#ServerUpdateNeeded', 'https://emby.media'),
html: Globalize.translate('core#ServerUpdateNeeded', '<a href="https://emby.media">https://emby.media</a>')
}));
} }
break; break;
default: default:

5
dashboard-ui/scripts/site.js
View file

@ -2099,10 +2099,7 @@ var AppInfo = {};
if (browser.mobile) { if (browser.mobile) {
define("prompt", [embyWebComponentsBowerPath + "/prompt/nativeprompt"], returnFirstDependency); define("prompt", [embyWebComponentsBowerPath + "/prompt/nativeprompt"], returnFirstDependency);
define("confirm", [embyWebComponentsBowerPath + "/confirm/nativeconfirm"], returnFirstDependency); define("confirm", [embyWebComponentsBowerPath + "/confirm/nativeconfirm"], returnFirstDependency);
define("alert", [embyWebComponentsBowerPath + "/alert/nativealert"], returnFirstDependency);
// We have some alerts with markup
//define("alert", [embyWebComponentsBowerPath + "/alert/nativealert"], returnFirstDependency);
define("alert", [embyWebComponentsBowerPath + "/alert/alert"], returnFirstDependency);
} else { } else {
define("prompt", [embyWebComponentsBowerPath + "/prompt/prompt"], returnFirstDependency); define("prompt", [embyWebComponentsBowerPath + "/prompt/prompt"], returnFirstDependency);
define("confirm", [embyWebComponentsBowerPath + "/confirm/confirm"], returnFirstDependency); define("confirm", [embyWebComponentsBowerPath + "/confirm/confirm"], returnFirstDependency);