From 47e35cc5dcf1e56b0ba794d7282af4890e0b2516 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 11 Sep 2016 17:02:32 -0400 Subject: [PATCH] reduce uses of paper-checkbox --- .../emby-webcomponents/prompt/prompt.js | 4 +- .../components/channelmapper/channelmapper.js | 2 +- .../components/guestinviter/connectlink.js | 2 +- dashboard-ui/components/viewcontainer-lite.js | 2 +- dashboard-ui/dashboard/dashboardhosting.js | 2 +- dashboard-ui/dashboard/devicesupload.js | 2 +- dashboard-ui/dashboardhosting.html | 24 +- dashboard-ui/devicesupload.html | 17 +- dashboard-ui/dlnaprofile.html | 2 +- dashboard-ui/dlnasettings.html | 66 ++-- dashboard-ui/legacy/fnchecked.js | 4 + .../livetvtunerprovider-hdhomerun.html | 40 +- dashboard-ui/plugincatalog.html | 11 +- dashboard-ui/reports.html | 2 +- dashboard-ui/scripts/dlnaprofile.js | 20 +- dashboard-ui/scripts/dlnasettings.js | 2 +- dashboard-ui/scripts/reports.js | 44 +-- dashboard-ui/scripts/site.js | 5 +- dashboard-ui/strings/en-US.json | 2 +- .../jquerymobile-1.4.5/jqm.checkbox.css | 52 --- .../jquerymobile-1.4.5/jqm.checkbox.js | 360 ------------------ 21 files changed, 141 insertions(+), 524 deletions(-) delete mode 100644 dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.checkbox.css delete mode 100644 dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.checkbox.js diff --git a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js index abdb383a6d..089a2af351 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js +++ b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js @@ -1,4 +1,4 @@ -define(['dialogHelper', 'layoutManager', 'scrollHelper', 'globalize', 'require', 'material-icons', 'emby-button', 'paper-icon-button-light', 'emby-input', 'formDialogStyle'], function (dialogHelper, layoutManager, scrollHelper, globalize, require) { +define(['dialogHelper', 'layoutManager', 'scrollHelper', 'globalize', 'dom', 'require', 'material-icons', 'emby-button', 'paper-icon-button-light', 'emby-input', 'formDialogStyle'], function (dialogHelper, layoutManager, scrollHelper, globalize, dom, require) { function setInputProperties(dlg, options) { var txtInput = dlg.querySelector('#txtInput'); @@ -61,6 +61,8 @@ define(['dialogHelper', 'layoutManager', 'scrollHelper', 'globalize', 'require', return false; }); + dlg.style.minWidth = (Math.min(400, dom.getWindowSize().innerWidth - 50)) + 'px'; + return dialogHelper.open(dlg).then(function () { if (layoutManager.tv) { diff --git a/dashboard-ui/components/channelmapper/channelmapper.js b/dashboard-ui/components/channelmapper/channelmapper.js index 2a6ab5e43a..da3c83b8a6 100644 --- a/dashboard-ui/components/channelmapper/channelmapper.js +++ b/dashboard-ui/components/channelmapper/channelmapper.js @@ -1,4 +1,4 @@ -define(['dialogHelper', 'loading', 'connectionManager', 'globalize', 'actionsheet', 'paper-checkbox', 'emby-input', 'paper-icon-button-light', 'emby-button', 'listViewStyle', 'material-icons', 'formDialogStyle'], +define(['dialogHelper', 'loading', 'connectionManager', 'globalize', 'actionsheet', 'emby-input', 'paper-icon-button-light', 'emby-button', 'listViewStyle', 'material-icons', 'formDialogStyle'], function (dialogHelper, loading, connectionManager, globalize, actionsheet) { return function (options) { diff --git a/dashboard-ui/components/guestinviter/connectlink.js b/dashboard-ui/components/guestinviter/connectlink.js index b88c2ac634..2208392fd3 100644 --- a/dashboard-ui/components/guestinviter/connectlink.js +++ b/dashboard-ui/components/guestinviter/connectlink.js @@ -1,4 +1,4 @@ -define(['dialogHelper', 'jQuery', 'emby-input', 'emby-button', 'emby-collapse', 'paper-checkbox', 'paper-icon-button-light', 'formDialogStyle'], function (dialogHelper, $) { +define(['dialogHelper', 'jQuery', 'emby-input', 'emby-button', 'emby-collapse', 'paper-icon-button-light', 'formDialogStyle'], function (dialogHelper, $) { function updateUserInfo(user, newConnectUsername, actionCallback, noActionCallback) { var currentConnectUsername = user.ConnectUserName || ''; diff --git a/dashboard-ui/components/viewcontainer-lite.js b/dashboard-ui/components/viewcontainer-lite.js index 37c36a5fe8..a9b60ce15a 100644 --- a/dashboard-ui/components/viewcontainer-lite.js +++ b/dashboard-ui/components/viewcontainer-lite.js @@ -46,11 +46,11 @@ define(['browser'], function (browser) { if (isPluginpage) { dependencies.push('jqmpopup'); dependencies.push('jqmcollapsible'); - dependencies.push('jqmcheckbox'); dependencies.push('legacy/dashboard'); dependencies.push('legacy/selectmenu'); dependencies.push('jqmcontrolgroup'); dependencies.push('jqmlistview'); + dependencies.push('fnchecked'); } if (isPluginpage || (newView.classList && newView.classList.contains('type-interior'))) { diff --git a/dashboard-ui/dashboard/dashboardhosting.js b/dashboard-ui/dashboard/dashboardhosting.js index b2d9450590..2dce166c73 100644 --- a/dashboard-ui/dashboard/dashboardhosting.js +++ b/dashboard-ui/dashboard/dashboardhosting.js @@ -1,4 +1,4 @@ -define(['jQuery'], function ($) { +define(['jQuery', 'fnchecked', 'emby-checkbox'], function ($) { function onSubmit() { var form = this; diff --git a/dashboard-ui/dashboard/devicesupload.js b/dashboard-ui/dashboard/devicesupload.js index 02f27edbc8..1d3ebb2e5d 100644 --- a/dashboard-ui/dashboard/devicesupload.js +++ b/dashboard-ui/dashboard/devicesupload.js @@ -1,4 +1,4 @@ -define(['jQuery'], function ($) { +define(['jQuery', 'fnchecked'], function ($) { function load(page, config) { diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html index bb6fbb74d3..0d96c90696 100644 --- a/dashboard-ui/dashboardhosting.html +++ b/dashboard-ui/dashboardhosting.html @@ -41,19 +41,25 @@
${LabelExternalDDNSHelp}
-
- ${LabelEnableHttps} -
${LabelEnableHttpsHelp}
+
+ +
${LabelEnableHttpsHelp}
-
-
- ${LabelEnableAutomaticPortMap} -
${LabelEnableAutomaticPortMapHelp}
+
+ +
${LabelEnableAutomaticPortMapHelp}

-
- +
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html index df4c89b3f1..0974a86171 100644 --- a/dashboard-ui/devicesupload.html +++ b/dashboard-ui/devicesupload.html @@ -1,4 +1,4 @@ -
+
@@ -16,15 +16,18 @@
${LabelCameraUploadPathHelp}
-
-
- ${LabelCreateCameraUploadSubfolder} -
${LabelCreateCameraUploadSubfolderHelp}
+
+ +
${LabelCreateCameraUploadSubfolderHelp}

-
- +
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html index 073026ea2e..f25a247bbc 100644 --- a/dashboard-ui/dlnaprofile.html +++ b/dashboard-ui/dlnaprofile.html @@ -1,4 +1,4 @@ -
+
diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html index 2f47fbddfc..a5e6397e01 100644 --- a/dashboard-ui/dlnasettings.html +++ b/dashboard-ui/dlnasettings.html @@ -1,57 +1,65 @@ -
+
-
- ${LabelEnableDlnaPlayTo} -
${LabelEnableDlnaPlayToHelp}
+
+ +
${LabelEnableDlnaPlayToHelp}
-
-
-
- ${LabelEnableDlnaDebugLogging} -
${LabelEnableDlnaDebugLoggingHelp}
+ +
+ +
${LabelEnableDlnaDebugLoggingHelp}
-
-
+
${LabelEnableDlnaClientDiscoveryIntervalHelp}
-
-
- ${LabelEnableDlnaServer} -
${LabelEnableDlnaServerHelp}
+ +
+ +
${LabelEnableDlnaServerHelp}
-
-
- ${LabelEnableBlastAliveMessages} -
${LabelEnableBlastAliveMessagesHelp}
+ +
+ +
${LabelEnableBlastAliveMessagesHelp}
-
-
+
${LabelBlastMessageIntervalHelp}
-
${LabelDefaultUserHelp}
-
-
- ${LabelEnableEnhancedMovies} -
${LabelEnableEnhancedMoviesHelp}
+
+ +
${LabelEnableEnhancedMoviesHelp}
-
-
diff --git a/dashboard-ui/legacy/fnchecked.js b/dashboard-ui/legacy/fnchecked.js index f4e61982d2..1005d73c61 100644 --- a/dashboard-ui/legacy/fnchecked.js +++ b/dashboard-ui/legacy/fnchecked.js @@ -12,4 +12,8 @@ return this.length && this[0].checked; } }; + + $.fn.checkboxradio = function () { + return this; + }; }); \ No newline at end of file diff --git a/dashboard-ui/livetvtunerprovider-hdhomerun.html b/dashboard-ui/livetvtunerprovider-hdhomerun.html index 9955f26a86..94fbc2e04b 100644 --- a/dashboard-ui/livetvtunerprovider-hdhomerun.html +++ b/dashboard-ui/livetvtunerprovider-hdhomerun.html @@ -1,4 +1,4 @@ -
+
@@ -9,26 +9,36 @@
-
- ${LabelEnableThisTuner} -
${LabelEnableThisTunerHelp}
+
+ +
${LabelEnableThisTunerHelp}
-
-
- ${LabelImportOnlyFavoriteChannels} -
${ImportFavoriteChannelsHelp}
+
+ +
${ImportFavoriteChannelsHelp}
-
-
- ${LabelAllowHWTranscoding} -
${AllowHWTranscodingHelp}
+
+ +
${AllowHWTranscodingHelp}
-

${DrmChannelsNotImported}


- - + +
diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html index bd55ad8182..7eaca14f69 100644 --- a/dashboard-ui/plugincatalog.html +++ b/dashboard-ui/plugincatalog.html @@ -1,15 +1,14 @@ -
+
-
-
- -
-
+