diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index 0bc3c5c600..9163ffce91 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -33,7 +33,7 @@
${LabelSkipIfGraphicalSubsPresentHelp}
-
+
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index a6b6ac709c..7b0f697f1f 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -158,6 +158,8 @@
document.body.appendChild(div);
libraryBrowser.createCardMenus(div);
+
+ elem = div;
}
return elem;
@@ -203,7 +205,10 @@
{ opacity: '0', offset: 0 },
{ opacity: '1', offset: 1 }];
var timing = { duration: 200, iterations: iterations, fill: 'both' };
- elem.animate(keyframes, timing);
+
+ if (elem.animate) {
+ elem.animate(keyframes, timing);
+ }
}
function fadeOut(elem, iterations) {
@@ -211,9 +216,16 @@
{ opacity: '1', offset: 0 },
{ opacity: '0', offset: 1 }];
var timing = { duration: 600, iterations: iterations, fill: 'both' };
- elem.animate(keyframes, timing).onfinish = function () {
+
+ var onfinish = function () {
elem.parentNode.removeChild(elem);
};
+
+ if (elem.animate) {
+ elem.animate(keyframes, timing).onfinish = onfinish;
+ } else {
+ onfinish();
+ }
}
function bindSearchEvents() {
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index b2fda574c5..832fc31d36 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -3127,7 +3127,7 @@ var AppInfo = {};
if (browserInfo.safari) {
- postInitDependencies.push('cordova/connectsdk/connectsdk');
+ postInitDependencies.push('cordova/ios/chromecast');
postInitDependencies.push('cordova/ios/orientation');
@@ -3170,22 +3170,31 @@ var AppInfo = {};
cordova.getAppVersion.getVersionNumber(function (appVersion) {
- var name = browserInfo.android ? "Emby for Android Mobile" : (browserInfo.safari ? "Emby for iOS" : "Emby Mobile");
+ require(['appStorage'], function (appStorage) {
- // Remove special characters
- var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');
+ var name = browserInfo.android ? "Emby for Android Mobile" : (browserInfo.safari ? "Emby for iOS" : "Emby Mobile");
- var deviceId = null;
+ // Remove special characters
+ var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');
- if (window.MainActivity) {
- deviceId = MainActivity.getLegacyDeviceId();
- }
+ var deviceId = null;
- resolve({
- deviceId: deviceId || device.uuid,
- deviceName: cleanDeviceName,
- appName: name,
- appVersion: appVersion
+ if (window.MainActivity) {
+
+ deviceId = appStorage.getItem('legacyDeviceId');
+
+ if (!deviceId) {
+ deviceId = MainActivity.getLegacyDeviceId();
+ appStorage.setItem('legacyDeviceId', deviceId);
+ }
+ }
+
+ resolve({
+ deviceId: deviceId || device.uuid,
+ deviceName: cleanDeviceName,
+ appName: name,
+ appVersion: appVersion
+ });
});
});