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

Merge branch 'dev'

Browse source 
Conflicts:
	MediaBrowser.Controller/Entities/BaseItem.cs
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/bower.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/ru.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ru.json
	SharedVersion.cs
This commit is contained in:
Luke Pulverenti 2016-01-11 21:55:52 -05:00
commit 7e639dbf67
293 changed files with 52567 additions and 4930 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dashboard-ui/scripts/librarybrowser.js
View file

@ -155,7 +155,7 @@
enableFullPaperTabs: function () {
if (browserInfo.animate && !browserInfo.mobile) {
//return true;
return true;
}
return AppInfo.isNativeApp;
@ -876,11 +876,11 @@
editMetadata: function (itemId) {
Dashboard.navigate('edititemmetadata.html?id=' + itemId);
return;
require(['components/metadataeditor/metadataeditor'], function () {
MetadataEditor.show(itemId);
});
//require(['components/metadataeditor/metadataeditor'], function (metadataeditor) {
// metadataeditor.show(itemId);
//});
},
showMoreCommands: function (positionTo, itemId, commands) {

8
dashboard-ui/scripts/nowplayingbar.js
View file

@ -91,10 +91,10 @@
elem.classList.add('hide');
};
//if (!browserInfo.animate || browserInfo.mobile) {
if (!browserInfo.animate || browserInfo.mobile) {
onfinish();
return;
//}
}
requestAnimationFrame(function () {
var keyframes = [
@ -113,9 +113,9 @@
elem.classList.remove('hide');
//if (!browserInfo.animate || browserInfo.mobile) {
if (!browserInfo.animate || browserInfo.mobile) {
return;
//}
}
requestAnimationFrame(function () {