@@ -406,7 +406,7 @@
-
+
diff --git a/dashboard-ui/dlnaserversettings.html b/dashboard-ui/dlnaserversettings.html
index a47776ba43..7593c5e570 100644
--- a/dashboard-ui/dlnaserversettings.html
+++ b/dashboard-ui/dlnaserversettings.html
@@ -4,7 +4,7 @@
${TitleDlna}
-
+
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index cc1367346f..0eb5a2d565 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -4,7 +4,7 @@
Emby
-
+
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 1783f797df..e07690622b 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -4,7 +4,7 @@
${TitleMediaLibrary}
-
+
@@ -21,9 +21,8 @@
-
-
-
${OptionDetectArchiveFilesAsMediaHelp}
+
${OptionDetectArchiveFilesAsMedia}
+
${OptionDetectArchiveFilesAsMediaHelp}
@@ -34,9 +33,8 @@
-
-
-
${OptionDetectArchiveFilesAsMediaHelp}
+
${OptionDetectArchiveFilesAsMedia}
+
${OptionDetectArchiveFilesAsMediaHelp}
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index ff1a772a8f..a6e5cd676c 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -4,7 +4,7 @@
${TitleMetadata}
-
+
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 257174cf07..a0fd1f6c4b 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -4,7 +4,7 @@
${TitleMetadata}
-
+
diff --git a/dashboard-ui/metadatanfo.html b/dashboard-ui/metadatanfo.html
index da38c8b7a6..e5ccb39fdb 100644
--- a/dashboard-ui/metadatanfo.html
+++ b/dashboard-ui/metadatanfo.html
@@ -4,7 +4,7 @@
${TitleMetadata}
-
+
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index a597dbf8b4..bb62be9da5 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -4,7 +4,7 @@
${TitleMetadata}
-
+
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index 4e68446a2a..d451f60965 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -4,7 +4,7 @@
${TitleNotifications}
-
+
diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html
index bafc6d34e1..37ad577e18 100644
--- a/dashboard-ui/plugincatalog.html
+++ b/dashboard-ui/plugincatalog.html
@@ -4,7 +4,7 @@
${TitlePlugins}
-
+
diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js
index 85b949d1dd..ffedb9b07d 100644
--- a/dashboard-ui/scripts/librarysettings.js
+++ b/dashboard-ui/scripts/librarysettings.js
@@ -12,8 +12,8 @@
$('#selectEnableRealtimeMonitor', page).val(config.EnableLibraryMonitor);
- $('#chkEnableAudioArchiveFiles', page).checked(config.EnableAudioArchiveFiles).checkboxradio("refresh");
- $('#chkEnableVideoArchiveFiles', page).checked(config.EnableVideoArchiveFiles).checkboxradio("refresh");
+ page.querySelector('#chkEnableAudioArchiveFiles').checked = config.EnableAudioArchiveFiles;
+ page.querySelector('#chkEnableVideoArchiveFiles').checked = config.EnableVideoArchiveFiles;
Dashboard.hideLoadingMsg();
}
@@ -29,8 +29,8 @@
config.EnableLibraryMonitor = $('#selectEnableRealtimeMonitor', form).val();
- config.EnableAudioArchiveFiles = $('#chkEnableAudioArchiveFiles', form).checked();
- config.EnableVideoArchiveFiles = $('#chkEnableVideoArchiveFiles', form).checked();
+ config.EnableAudioArchiveFiles = form.querySelector('#chkEnableAudioArchiveFiles').checked;
+ config.EnableVideoArchiveFiles = form.querySelector('#chkEnableVideoArchiveFiles').checked;
ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
});
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 8c3910612d..fc523621b5 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2449,7 +2449,8 @@ var AppInfo = {};
});
}
- var deviceId = appStorage.getItem('_deviceId');
+ var deviceIdKey = '_deviceId1';
+ var deviceId = appStorage.getItem(deviceIdKey);
if (deviceId) {
onDeviceAdAcquired(deviceId);
@@ -2460,7 +2461,7 @@ var AppInfo = {};
keys.push((navigator.cpuClass || ""));
keys.push(new Date().getTime());
var randomId = CryptoJS.SHA1(keys.join('|')).toString();
- appStorage.setItem('_deviceId', randomId);
+ appStorage.setItem(deviceIdKey, randomId);
onDeviceAdAcquired(randomId);
});
}
@@ -2522,11 +2523,11 @@ function addLegacyDependencies(depends, url) {
if (isPluginpage) {
depends.push('jqmpopup');
depends.push('jqmcollapsible');
+ depends.push('jqmcheckbox');
}
depends.push('jqmcontrolgroup');
depends.push('jqmlistview');
- depends.push('jqmcheckbox');
depends.push('scripts/notifications');
}
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index 17e9ad8873..ca074f5abc 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -4,7 +4,7 @@
-
+
diff --git a/dashboard-ui/userlibraryaccess.html b/dashboard-ui/userlibraryaccess.html
index c67f264b83..3e6623c80b 100644
--- a/dashboard-ui/userlibraryaccess.html
+++ b/dashboard-ui/userlibraryaccess.html
@@ -4,7 +4,7 @@
-
+
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index e0e6403a5d..ebf2adedf0 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -4,7 +4,7 @@
${TitleNewUser}
-
+
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 1129b6e016..9063869f65 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -4,7 +4,7 @@
-