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

update startup dependencies

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-01 23:15:58 -05:00
parent 5200b37787
commit 96eb9ea63a
7 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dashboard-ui/scripts/search.js
View file

@ -158,7 +158,6 @@
return elem;
}
var currentAnimation;
var isVisible;
function onHeaderSearchChange(val) {
@ -199,7 +198,7 @@
{ opacity: '0', offset: 0 },
{ opacity: '1', offset: 1 }];
var timing = { duration: 200, iterations: iterations, fill: 'both' };
currentAnimation = elem.animate(keyframes, timing);
elem.animate(keyframes, timing);
}
function fadeOut(elem, iterations) {
@ -207,7 +206,9 @@
{ opacity: '1', offset: 0 },
{ opacity: '0', offset: 1 }];
var timing = { duration: 600, iterations: iterations, fill: 'both' };
currentAnimation = elem.animate(keyframes, timing);
elem.animate(keyframes, timing).onfinish = function () {
elem.parentNode.removeChild(elem);
};
}
function bindSearchEvents() {

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

@ -2219,8 +2219,11 @@ var AppInfo = {};
// Remove special characters
var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');
var deviceId = window.MainActivity ? MainActivity.getLegacyDeviceId() : null;
deviceId = deviceId || device.uuid;
resolve({
deviceId: device.uuid,
deviceId: deviceId,
deviceName: cleanDeviceName,
appName: name,
appVersion: appVersion
@ -2277,7 +2280,7 @@ var AppInfo = {};
if (deviceId) {
onDeviceAdAcquired(deviceId);
} else {
require(['cryptojs-md5'], function () {
require(['cryptojs-sha1'], function () {
var keys = [];
keys.push(navigator.userAgent);
keys.push((navigator.cpuClass || ""));