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

disable now playing bar animation for now

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:25:31 -05:00
parent 996f2504b2
commit 7ac20e0572
9 changed files with 315 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

24
dashboard-ui/scripts/localsync.js
View file

@ -14,28 +14,28 @@
return syncPromise.promise();
}
var deferred = DeferredBuilder.Deferred();
return new Promise(function (resolve, reject) {
require(['multiserversync'], function () {
require(['multiserversync'], function () {
options = options || {};
options = options || {};
LocalSync.normalizeSyncOptions(options);
LocalSync.normalizeSyncOptions(options);
options.cameraUploadServers = AppSettings.cameraUploadServers();
options.cameraUploadServers = AppSettings.cameraUploadServers();
syncPromise = new MediaBrowser.MultiServerSync(ConnectionManager).sync(options).then(function () {
syncPromise = new MediaBrowser.MultiServerSync(ConnectionManager).sync(options).then(function () {
syncPromise = null;
deferred.resolve();
syncPromise = null;
resolve();
}, function () {
}, function () {
syncPromise = null;
syncPromise = null;
});
});
});
return deferred.promise();
});
},
normalizeSyncOptions: function (options) {

14
dashboard-ui/scripts/loginpage.js
View file

@ -3,16 +3,16 @@
getApiClient: function () {
var serverId = getParameterByName('serverid');
var deferred = DeferredBuilder.Deferred();
if (serverId) {
deferred.resolveWith(null, [ConnectionManager.getOrCreateApiClient(serverId)]);
return new Promise(function (resolve, reject) {
} else {
deferred.resolveWith(null, [ApiClient]);
}
if (serverId) {
resolve(ConnectionManager.getOrCreateApiClient(serverId));
return deferred.promise();
} else {
resolve(ApiClient);
}
});
},
onPageShow: function () {

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

@ -97,6 +97,8 @@
return;
}
onfinish();
return;
requestAnimationFrame(function () {
var keyframes = [
{ height: getHeight(elem), offset: 0 },
@ -117,6 +119,7 @@
if (!browserInfo.animate || browserInfo.mobile) {
return;
}
return;
requestAnimationFrame(function () {

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

@ -1465,21 +1465,17 @@ var Dashboard = {
loadExternalPlayer: function () {
var deferred = DeferredBuilder.Deferred();
return new Promise(function (resolve, reject) {
require(['scripts/externalplayer.js'], function () {
require(['scripts/externalplayer.js'], function () {
if (Dashboard.isRunningInCordova()) {
require(['cordova/externalplayer.js'], function () {
deferred.resolve();
});
} else {
deferred.resolve();
}
if (Dashboard.isRunningInCordova()) {
require(['cordova/externalplayer.js'], resolve);
} else {
resolve();
}
});
});
return deferred.promise();
},
exitOnBack: function () {
@ -2190,6 +2186,8 @@ var AppInfo = {};
deps.push('scripts/librarymenu');
deps.push('apiclient/deferred');
deps.push('css!css/card.css');
require(deps, function () {
$.mobile.filterHtml = Dashboard.filterHtml;