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

update startup dependencies

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

View file

@ -39,6 +39,6 @@
"commit": "cec8e49744a1e18b14a711eea77e201bb70de544" "commit": "cec8e49744a1e18b14a711eea77e201bb70de544"
}, },
"_source": "git://github.com/desandro/doc-ready.git", "_source": "git://github.com/desandro/doc-ready.git",
"_target": "~1.0.4", "_target": "1.0.x",
"_originalSource": "doc-ready" "_originalSource": "doc-ready"
} }

View file

@ -31,6 +31,6 @@
"commit": "34fc5e4a0f252964ed2790138b8d7d30d04b55c1" "commit": "34fc5e4a0f252964ed2790138b8d7d30d04b55c1"
}, },
"_source": "git://github.com/desandro/get-style-property.git", "_source": "git://github.com/desandro/get-style-property.git",
"_target": "~1.0.4", "_target": "1.x",
"_originalSource": "get-style-property" "_originalSource": "get-style-property"
} }

View file

@ -36,7 +36,7 @@
"tag": "v1.0.8", "tag": "v1.0.8",
"commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff" "commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff"
}, },
"_source": "git://github.com/polymerelements/iron-selector.git", "_source": "git://github.com/PolymerElements/iron-selector.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-selector" "_originalSource": "PolymerElements/iron-selector"
} }

View file

@ -110,40 +110,37 @@
function isUnlockedOverride(feature) { function isUnlockedOverride(feature) {
var deferred = DeferredBuilder.Deferred();
if (feature == 'playback' || feature == 'livetv') { if (feature == 'playback' || feature == 'livetv') {
isPlaybackUnlockedViaOldApp(deferred); return isPlaybackUnlockedViaOldApp();
} else { } else {
deferred.resolveWith(null, [false]); return new Promise(function (resolve, reject) {
}
return deferred.promise(); resolve(false);
});
}
} }
function isPlaybackUnlockedViaOldApp(deferred) { function isPlaybackUnlockedViaOldApp() {
testDeviceId(ConnectionManager.deviceId()).then(function (isUnlocked) { return testDeviceId(ConnectionManager.deviceId()).then(function (isUnlocked) {
if (isUnlocked) { if (isUnlocked) {
deferred.resolveWith(null, [true]); return true;
return;
} }
var legacyDeviceId = NativeIapManager.getLegacyDeviceId(); return testDeviceId(device.uuid).then(function (isUnlocked) {
if (legacyDeviceId) {
testDeviceId(legacyDeviceId).then(function(isUnlocked) {
if (isUnlocked) { if (isUnlocked) {
deferred.resolveWith(null, [true]); return true;
return; }
}
deferred.resolveWith(null, [false]); var legacyDeviceId = MainActivity.getLegacyDeviceId();
}); if (legacyDeviceId) {
} else { return testDeviceId(legacyDeviceId);
deferred.resolveWith(null, [false]); }
}
return false;
});
}); });
} }

View file

@ -660,8 +660,8 @@ div[data-role="controlgroup"] a.ui-btn-active {
} }
.paperLibraryViewNav.headroom--unpinned:not(.headroomDisabled) { .paperLibraryViewNav.headroom--unpinned:not(.headroomDisabled) {
-webkit-transform: translateY(-205%); -webkit-transform: translateY(-240%);
transform: translateY(-205%); transform: translateY(-240%);
} }
.checkboxContainer { .checkboxContainer {

View file

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

View file

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