mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

get cryptojs from bower; rework voice dialog

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-13 15:46:24 -05:00
parent d010a273a6
commit 9e9ef216fa
102 changed files with 7317 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/dashboardpage.js
View file

@ -779,6 +779,8 @@
var localAccessHtml = Globalize.translate('LabelLocalAccessUrl', '<a href="' + systemInfo.LocalAddress + '" target="_blank">' + systemInfo.LocalAddress + '</a>');
//localAccessHtml += '<a class="clearLink" href="https://github.com/MediaBrowser/Wiki/wiki/Connectivity" target="_blank"><paper-icon-button icon="info"></paper-icon-button></a>';
$('.localUrl', page).html(localAccessHtml).show().trigger('create');
} else {
$('.externalUrl', page).hide();

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

@ -428,7 +428,7 @@ var Dashboard = {
return "ConfigurationPage?name=" + encodeURIComponent(name);
},
navigate: function (url, preserveQueryString, transition) {
navigate: function (url, preserveQueryString) {
if (!url) {
throw new Error('url cannot be null or empty');
@ -441,10 +441,6 @@ var Dashboard = {
var options = {};
if (transition) {
options.transition = transition;
}
$.mobile.changePage(url, options);
},
@ -1799,6 +1795,18 @@ var AppInfo = {};
paths.sharingwidget = "components/sharingwidget";
}
var sha1Path = bowerPath + "/cryptojslib/components/sha1-min";
var md5Path = bowerPath + "/cryptojslib/components/md5-min";
var shim = {};
shim[sha1Path] = {
deps: [bowerPath + "/cryptojslib/components/core-min"]
};
shim[md5Path] = {
deps: [bowerPath + "/cryptojslib/components/core-min"]
};
requirejs.config({
map: {
'*': {
@ -1808,11 +1816,12 @@ var AppInfo = {};
},
urlArgs: urlArgs,
paths: paths
paths: paths,
shim: shim
});
define("cryptojs-sha1", ["apiclient/sha1"]);
define("cryptojs-md5", ["apiclient/md5"]);
define("cryptojs-sha1", [sha1Path]);
define("cryptojs-md5", [md5Path]);
// Done
define("emby-icons", ["html!" + bowerPath + "/emby-icons/emby-icons.html"]);

2
dashboard-ui/scripts/sync.js
View file

@ -275,7 +275,7 @@
return false;
});
$('.btnCancel').on('click', function () {
$('.btnCancel', dlg).on('click', function () {
paperDialogHelper.close(dlg);
});