From 3920d730458ecf2e39cfe4262822267005eb48f3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 7 Jun 2015 21:23:56 -0400
Subject: [PATCH] update live tv scrolling

---
 dashboard-ui/css/librarybrowser.css        |   1 -
 dashboard-ui/css/livetv.css                |   2 -
 dashboard-ui/css/metadataeditor.css        |   2 -
 dashboard-ui/css/nowplaying.css            |   2 -
 dashboard-ui/css/search.css                |   2 -
 dashboard-ui/css/site.css                  |  21 +-
 dashboard-ui/dlnaprofile.html              |  14 +-
 dashboard-ui/dlnaprofiles.html             |   2 +-
 dashboard-ui/dlnaserversettings.html       |   6 +-
 dashboard-ui/dlnasettings.html             |   6 +-
 dashboard-ui/edititemimages.html           |   2 +-
 dashboard-ui/edititemmetadata.html         |   2 +-
 dashboard-ui/edititemsubtitles.html        |   5 +-
 dashboard-ui/encodingsettings.html         |   6 +-
 dashboard-ui/itembynamedetails.html        |   4 +-
 dashboard-ui/itemdetails.html              |   2 +-
 dashboard-ui/librarysettings.html          |   8 +-
 dashboard-ui/livetvguide.html              |   4 +-
 dashboard-ui/livetvnewrecording.html       |   2 +-
 dashboard-ui/livetvprogram.html            |   4 +-
 dashboard-ui/livetvrecording.html          |   4 +-
 dashboard-ui/livetvtimer.html              |   2 +-
 dashboard-ui/metadatanfo.html              |   6 +-
 dashboard-ui/nowplaying.html               |   2 +-
 dashboard-ui/scheduledtask.html            |   5 +-
 dashboard-ui/scheduledtasks.html           |   2 +-
 dashboard-ui/scripts/dlnaprofile.js        |  19 +-
 dashboard-ui/scripts/dlnaprofiles.js       |   2 +-
 dashboard-ui/scripts/dlnaserversettings.js |  40 +--
 dashboard-ui/scripts/dlnasettings.js       |  36 +--
 dashboard-ui/scripts/encodingsettings.js   |  55 ++--
 dashboard-ui/scripts/librarylist.js        |   6 +
 dashboard-ui/scripts/librarysettings.js    |  59 ++--
 dashboard-ui/scripts/mediaplayer.js        | 335 +++++++++++----------
 dashboard-ui/scripts/metadatanfo.js        |  52 ++--
 dashboard-ui/scripts/scheduledtaskpage.js  |  73 ++---
 dashboard-ui/scripts/scheduledtaskspage.js |  20 +-
 dashboard-ui/scripts/search.js             |   2 +-
 dashboard-ui/scripts/site.js               |   2 +-
 39 files changed, 404 insertions(+), 415 deletions(-)

diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index fecc66559e..f5ca9465bd 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -596,7 +596,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
 .itemOverview {
     text-overflow: ellipsis;
     max-height: 100px;
-    overflow-y: auto;
     padding-right: .5em;
 }
 
diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css
index 63c3543bc6..706c389969 100644
--- a/dashboard-ui/css/livetv.css
+++ b/dashboard-ui/css/livetv.css
@@ -160,7 +160,6 @@
 
 .timeslotHeaders {
     white-space: nowrap;
-    overflow-x: scroll;
 }
 
 .mobileGuide .timeslotHeaders {
@@ -248,7 +247,6 @@
 
 .programGrid {
     padding-bottom: 4px;
-    overflow-x: scroll;
 }
 
 .programGrid, .timeslotHeaders {
diff --git a/dashboard-ui/css/metadataeditor.css b/dashboard-ui/css/metadataeditor.css
index b33bb13e83..11142ede77 100644
--- a/dashboard-ui/css/metadataeditor.css
+++ b/dashboard-ui/css/metadataeditor.css
@@ -290,8 +290,6 @@
         bottom: 0;
         left: 0;
         width: 30%;
-        overflow-y: scroll;
-        overflow-x: auto !important;
         display: block;
         border-right: 1px solid #555;
     }
diff --git a/dashboard-ui/css/nowplaying.css b/dashboard-ui/css/nowplaying.css
index cdc7d78357..ec0280a81d 100644
--- a/dashboard-ui/css/nowplaying.css
+++ b/dashboard-ui/css/nowplaying.css
@@ -31,8 +31,6 @@
     left: 0;
     right: 0;
     background-color: rgba(0,0,0,.9);
-    overflow-x: auto;
-    overflow-y: hidden;
     z-index: 1000;
 }
 
diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css
index 79fd6dc0c5..aa5d72d321 100644
--- a/dashboard-ui/css/search.css
+++ b/dashboard-ui/css/search.css
@@ -201,8 +201,6 @@
     bottom: 0;
     z-index: 1000;
     border: 0 !important;
-    overflow-x: hidden;
-    overflow-y: auto;
 }
 
 .searchResultsContainer {
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index d4b42ea00a..7198750e18 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -162,6 +162,12 @@ h1 a:hover {
     margin: -10px 0 0 -10px;
 }
 
+.smoothScrollX {
+    overflow-x: scroll;
+    -webkit-overflow-scrolling: touch;
+    overflow-y: hidden;
+}
+
 .hiddenScrollX {
     overflow-x: scroll;
     -webkit-overflow-scrolling: touch;
@@ -180,14 +186,23 @@ h1 a:hover {
     }
 
 
-.hiddenScrollY, .ui-panel-inner {
+.smoothScrollY {
     overflow-y: auto;
-    -ms-overflow-style: none;
-    overflow: -moz-scrollbars-none;
     -webkit-overflow-scrolling: touch;
     overflow-x: hidden;
 }
 
+.hiddenScrollY, .ui-panel-inner {
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+    overflow-x: hidden;
+}
+
+.touch .hiddenScrollY {
+    -ms-overflow-style: none;
+    overflow: -moz-scrollbars-none;
+}
+
     .touch .hiddenScrollY::-webkit-scrollbar, .touch .ui-panel-inner::-webkit-scrollbar {
         width: 0 !important;
         display: none;
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index ed911d7b58..5cdaee2253 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -4,7 +4,7 @@
     <title>${TitleDlna}</title>
 </head>
 <body>
-    <div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles">
+    <div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="scripts/dlnaprofile">
 
         <div data-role="content">
             <div class="content-primary">
@@ -725,18 +725,6 @@
             </div>
 
         </div>
-
-        <script type="text/javascript">
-            $('.dlnaProfileForm').off('submit', DlnaProfilePage.onSubmit).on('submit', DlnaProfilePage.onSubmit);
-            $('.editDirectPlayProfileForm').off('submit', DlnaProfilePage.onDirectPlayFormSubmit).on('submit', DlnaProfilePage.onDirectPlayFormSubmit);
-            $('.transcodingProfileForm').off('submit', DlnaProfilePage.onTranscodingProfileFormSubmit).on('submit', DlnaProfilePage.onTranscodingProfileFormSubmit);
-            $('.containerProfileForm').off('submit', DlnaProfilePage.onContainerProfileFormSubmit).on('submit', DlnaProfilePage.onContainerProfileFormSubmit);
-            $('.codecProfileForm').off('submit', DlnaProfilePage.onCodecProfileFormSubmit).on('submit', DlnaProfilePage.onCodecProfileFormSubmit);
-            $('.editResponseProfileForm').off('submit', DlnaProfilePage.onResponseProfileFormSubmit).on('submit', DlnaProfilePage.onResponseProfileFormSubmit);
-            $('.identificationHeaderForm').off('submit', DlnaProfilePage.onIdentificationHeaderFormSubmit).on('submit', DlnaProfilePage.onIdentificationHeaderFormSubmit);
-            $('.xmlAttributeForm').off('submit', DlnaProfilePage.onXmlAttributeFormSubmit).on('submit', DlnaProfilePage.onXmlAttributeFormSubmit);
-            $('.subtitleProfileForm').off('submit', DlnaProfilePage.onSubtitleProfileFormSubmit).on('submit', DlnaProfilePage.onSubtitleProfileFormSubmit);
-        </script>
     </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/dashboard-ui/dlnaprofiles.html b/dashboard-ui/dlnaprofiles.html
index a05a21db07..b9ecf3e55c 100644
--- a/dashboard-ui/dlnaprofiles.html
+++ b/dashboard-ui/dlnaprofiles.html
@@ -4,7 +4,7 @@
     <title>${TitleDlna}</title>
 </head>
 <body>
-    <div id="dlnaProfilesPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles">
+    <div id="dlnaProfilesPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="scripts/dlnaprofiles">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/dlnaserversettings.html b/dashboard-ui/dlnaserversettings.html
index c7755e3f4a..79a5121587 100644
--- a/dashboard-ui/dlnaserversettings.html
+++ b/dashboard-ui/dlnaserversettings.html
@@ -4,7 +4,7 @@
     <title>${TitleDlna}</title>
 </head>
 <body>
-    <div id="dlnaServerSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20server">
+    <div id="dlnaServerSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20server" data-require="scripts/dlnaserversettings">
 
         <div data-role="content">
             <div class="content-primary">
@@ -58,10 +58,6 @@
 
             </div>
         </div>
-
-        <script type="text/javascript">
-            $('.dlnaServerSettingsForm').off('submit', DlnaServerSettingsPage.onSubmit).on('submit', DlnaServerSettingsPage.onSubmit);
-        </script>
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html
index 6e638df97c..30a82b1f6e 100644
--- a/dashboard-ui/dlnasettings.html
+++ b/dashboard-ui/dlnasettings.html
@@ -4,7 +4,7 @@
     <title>${TitleDlna}</title>
 </head>
 <body>
-    <div id="dlnaSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to">
+    <div id="dlnaSettingsPage" data-role="page" class="page type-interior dlnaPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to" data-require="scripts/dlnasettings">
 
         <div data-role="content">
             <div class="content-primary">
@@ -48,10 +48,6 @@
 
             </div>
         </div>
-
-        <script type="text/javascript">
-            $('.dlnaSettingsForm').off('submit', DlnaSettingsPage.onSubmit).on('submit', DlnaSettingsPage.onSubmit);
-        </script>
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html
index e06640b3ee..588d26c3bc 100644
--- a/dashboard-ui/edititemimages.html
+++ b/dashboard-ui/edititemimages.html
@@ -6,7 +6,7 @@
 <body>
     <div id="editItemImagesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/edititemimages">
         <div data-role="content editPageContent">
-            <div class="editPageSidebar">
+            <div class="editPageSidebar smoothScrollY">
                 <div class="libraryTree">
                     <ul></ul>
                 </div>
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html
index 46e4ac7c77..4ba32ec7ca 100644
--- a/dashboard-ui/edititemmetadata.html
+++ b/dashboard-ui/edititemmetadata.html
@@ -6,7 +6,7 @@
 <body>
     <div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}">
         <div data-role="content editPageContent">
-            <div class="editPageSidebar">
+            <div class="editPageSidebar smoothScrollY">
                 <div class="libraryTree">
                     <ul></ul>
                 </div>
diff --git a/dashboard-ui/edititemsubtitles.html b/dashboard-ui/edititemsubtitles.html
index dfcdb5bddb..60f20f88e8 100644
--- a/dashboard-ui/edititemsubtitles.html
+++ b/dashboard-ui/edititemsubtitles.html
@@ -6,10 +6,9 @@
 <body>
     <div id="editItemSubtitlesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}">
         <div data-role="content editPageContent">
-            <div class="editPageSidebar">
+            <div class="editPageSidebar smoothScrollY">
                 <div class="libraryTree">
-                    <ul>
-                    </ul>
+                    <ul></ul>
                 </div>
             </div>
             <div class="editPageInnerContent">
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index d6a8849fe2..2f272ba49c 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -4,7 +4,7 @@
     <title>${TitlePlayback}</title>
 </head>
 <body>
-    <div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Transcoding">
+    <div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Transcoding" data-require="scripts/encodingsettings">
 
         <div data-role="content">
             <div class="content-primary">
@@ -84,10 +84,6 @@
                 </form>
             </div>
         </div>
-
-        <script type="text/javascript">
-            $('.encodingSettingsForm').off('submit', EncodingSettingsPage.onSubmit).on('submit', EncodingSettingsPage.onSubmit);
-        </script>
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index 24e3a50980..c4e86a8d0c 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -129,7 +129,7 @@
                             <span class="userDataIcons"></span>
                         </p>
                         <p class="itemGenres"></p>
-                        <p class="itemOverview desktopOverview"></p>
+                        <p class="itemOverview desktopOverview smoothScrollY"></p>
                         <p id="itemBirthday"></p>
                         <p id="itemBirthLocation"></p>
                         <p id="itemDeathDate"></p>
@@ -149,7 +149,7 @@
             <a class="btnSync hide" data-role="button" data-icon="refresh" data-inline="true" data-mini="true" href="#">${ButtonSync}</a>
             <button class="btnMoreCommands hide jqmButtonNoText" type="button" data-icon="ellipsis-v" data-inline="true" data-mini="true" data-iconpos="notext">${ButtonMore}</button>
         </div>
-        <p class="itemOverview mobileOverview"></p>
+        <p class="itemOverview mobileOverview smoothScrollY"></p>
         <div data-role="content" style="padding-top: 0;">
 
             <div id="itemTabs" style="text-align: center; margin: 0 0 1em;"></div>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 855ec87e62..bb37cd8415 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -177,7 +177,7 @@
                         </div>
                         <p id="artist"></p>
                         <p class="itemGenres"></p>
-                        <p class="itemOverview"></p>
+                        <p class="itemOverview smoothScrollY"></p>
                         <p id="seriesAirTime"></p>
                     </div>
                 </div>
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 01989434a3..0ebf7b1b72 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -4,7 +4,7 @@
     <title>${TitleMediaLibrary}</title>
 </head>
 <body>
-    <div id="librarySettingsPage" data-role="page" class="page type-interior mediaLibraryPage">
+    <div id="librarySettingsPage" data-role="page" class="page type-interior mediaLibraryPage" data-require="scripts/librarysettings">
 
         <div data-role="content">
             <div class="content-primary">
@@ -14,7 +14,7 @@
                     <a href="#" data-role="button" class="ui-btn-active">${TabAdvanced}</a>
                 </div>
 
-                <form id="librarySettingsForm">
+                <form class="librarySettingsForm">
 
                     <ul data-role="listview" class="ulForm">
                         <li class="fldImagesByName" style="display:none;">
@@ -87,10 +87,6 @@
 
             </div>
         </div>
-
-        <script type="text/javascript">
-            $('#librarySettingsForm').on('submit', LibrarySettingsPage.onSubmit);
-        </script>
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html
index a81187ca38..a5e968ff40 100644
--- a/dashboard-ui/livetvguide.html
+++ b/dashboard-ui/livetvguide.html
@@ -22,13 +22,13 @@
                             <a href="#popupConfig" data-rel="popup" class="accentButton" style="display:block;padding-left:5px;"><i class="fa fa-calendar"></i><span class="currentDate"></span></a>
                         </div>
                     </div>
-                    <div class="timeslotHeaders"></div>
+                    <div class="timeslotHeaders hiddenScrollX"></div>
                 </div>
 
                 <div class="programContainer">
 
                     <div class="channelList"></div>
-                    <div class="programGrid"></div>
+                    <div class="programGrid hiddenScrollX"></div>
                 </div>
                 <div class="channelPaging"></div>
             </div>
diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html
index 1266fe3fd2..7a38589dca 100644
--- a/dashboard-ui/livetvnewrecording.html
+++ b/dashboard-ui/livetvnewrecording.html
@@ -22,7 +22,7 @@
                     <span class="itemCommunityRating"></span>
                 </p>
                 <p class="itemGenres"></p>
-                <p class="itemOverview"></p>
+                <p class="itemOverview smoothScrollY"></p>
 
                 <br />
 
diff --git a/dashboard-ui/livetvprogram.html b/dashboard-ui/livetvprogram.html
index 25224b71ac..f491442e33 100644
--- a/dashboard-ui/livetvprogram.html
+++ b/dashboard-ui/livetvprogram.html
@@ -29,13 +29,13 @@
                                 <span class="userDataIcons"></span>
                             </p>
                             <p class="itemGenres desktopGenres"></p>
-                            <p class="itemOverview desktopOverview"></p>
+                            <p class="itemOverview desktopOverview smoothScrollY"></p>
                         </td>
                     </tr>
                 </table>
             </div>
             <p class="itemGenres mobileGenres"></p>
-            <p class="itemOverview mobileOverview"></p>
+            <p class="itemOverview mobileOverview smoothScrollY"></p>
         </div>
         <div class="detailButtonsContainer">
             <span id="playButtonContainer" style="display: none;">
diff --git a/dashboard-ui/livetvrecording.html b/dashboard-ui/livetvrecording.html
index 1d026cbfe3..12ce2ef8fc 100644
--- a/dashboard-ui/livetvrecording.html
+++ b/dashboard-ui/livetvrecording.html
@@ -29,13 +29,13 @@
                                 <span class="userDataIcons"></span>
                             </p>
                             <p class="itemGenres desktopGenres"></p>
-                            <p class="itemOverview desktopOverview"></p>
+                            <p class="itemOverview desktopOverview smoothScrollY"></p>
                         </td>
                     </tr>
                 </table>
             </div>
             <p class="itemGenres mobileGenres"></p>
-            <p class="itemOverview mobileOverview"></p>
+            <p class="itemOverview mobileOverview smoothScrollY"></p>
         </div>
         <div class="detailButtonsContainer">
             <span id="playButtonContainer" style="display: none;">
diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html
index 9352c935ab..883012eb9a 100644
--- a/dashboard-ui/livetvtimer.html
+++ b/dashboard-ui/livetvtimer.html
@@ -29,7 +29,7 @@
                         <p class="itemGenres"></p>
                     </div>
                 </div>
-                <p class="itemOverview"></p>
+                <p class="itemOverview smoothScrollY"></p>
 
                 <p style="margin-top: 2em;">
                     <span class="timerStatus"></span>
diff --git a/dashboard-ui/metadatanfo.html b/dashboard-ui/metadatanfo.html
index 8aaf6c99be..26b3dd59bd 100644
--- a/dashboard-ui/metadatanfo.html
+++ b/dashboard-ui/metadatanfo.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage">
+    <div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadatanfo">
 
         <div data-role="content">
 
@@ -70,10 +70,6 @@
             </div>
 
         </div>
-
-        <script type="text/javascript">
-            $('.metadataNfoForm').off('submit', NfoMetadataPage.onSubmit).on('submit', NfoMetadataPage.onSubmit);
-        </script>
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index dfe1c9a887..caf0512c02 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -144,7 +144,7 @@
         </div>
 
         <div class="chapterMenuOverlay" style="display: none;"></div>
-        <div class="chapterMenu" style="display: none;">
+        <div class="chapterMenu hiddenScrollX" style="display: none;">
             <div class="chapterMenuInner">
             </div>
         </div>
diff --git a/dashboard-ui/scheduledtask.html b/dashboard-ui/scheduledtask.html
index 7328ac3739..f100fce9f8 100644
--- a/dashboard-ui/scheduledtask.html
+++ b/dashboard-ui/scheduledtask.html
@@ -4,7 +4,7 @@
     <title>${TitleScheduledTasks}</title>
 </head>
 <body>
-    <div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks">
+    <div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="scripts/scheduledtaskpage">
         <div data-role="content">
             <div class="content-primary">
 
@@ -91,9 +91,6 @@
                 </div>
             </form>
         </div>
-        <script type="text/javascript">
-            $('.addTriggerForm').off('submit', ScheduledTaskPage.onSubmit).on('submit', ScheduledTaskPage.onSubmit);
-        </script>
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/scheduledtasks.html b/dashboard-ui/scheduledtasks.html
index 41cdb39aa7..1114f5e852 100644
--- a/dashboard-ui/scheduledtasks.html
+++ b/dashboard-ui/scheduledtasks.html
@@ -4,7 +4,7 @@
     <title>${TitleScheduledTasks}</title>
 </head>
 <body>
-    <div id="scheduledTasksPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks">
+    <div id="scheduledTasksPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="scripts/scheduledtaskspage">
         <div data-role="content">
             <div class="content-primary">
 
diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js
index 0293b5ab13..a47d79858f 100644
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@@ -940,7 +940,7 @@
         profile.UserId = $('#selectUser', page).val();
     }
 
-    $(document).on('pageinit', "#dlnaProfilePage", function () {
+    $(document).on('pageinitdepends', "#dlnaProfilePage", function () {
 
         var page = this;
 
@@ -1056,19 +1056,24 @@
             editSubtitleProfile(page);
         });
 
-    }).on('pageshow', "#dlnaProfilePage", function () {
+        $('.dlnaProfileForm').off('submit', DlnaProfilePage.onSubmit).on('submit', DlnaProfilePage.onSubmit);
+        $('.editDirectPlayProfileForm').off('submit', DlnaProfilePage.onDirectPlayFormSubmit).on('submit', DlnaProfilePage.onDirectPlayFormSubmit);
+        $('.transcodingProfileForm').off('submit', DlnaProfilePage.onTranscodingProfileFormSubmit).on('submit', DlnaProfilePage.onTranscodingProfileFormSubmit);
+        $('.containerProfileForm').off('submit', DlnaProfilePage.onContainerProfileFormSubmit).on('submit', DlnaProfilePage.onContainerProfileFormSubmit);
+        $('.codecProfileForm').off('submit', DlnaProfilePage.onCodecProfileFormSubmit).on('submit', DlnaProfilePage.onCodecProfileFormSubmit);
+        $('.editResponseProfileForm').off('submit', DlnaProfilePage.onResponseProfileFormSubmit).on('submit', DlnaProfilePage.onResponseProfileFormSubmit);
+        $('.identificationHeaderForm').off('submit', DlnaProfilePage.onIdentificationHeaderFormSubmit).on('submit', DlnaProfilePage.onIdentificationHeaderFormSubmit);
+        $('.xmlAttributeForm').off('submit', DlnaProfilePage.onXmlAttributeFormSubmit).on('submit', DlnaProfilePage.onXmlAttributeFormSubmit);
+        $('.subtitleProfileForm').off('submit', DlnaProfilePage.onSubtitleProfileFormSubmit).on('submit', DlnaProfilePage.onSubtitleProfileFormSubmit);
 
-        var page = this;
-
-        loadProfile(page);
-
-    }).on('pagebeforeshow', "#dlnaProfilePage", function () {
+    }).on('pageshowready', "#dlnaProfilePage", function () {
 
         var page = this;
 
         $('.radioTabButton', page).checked(false).checkboxradio('refresh');
         $('#radioInfo', page).checked(true).checkboxradio('refresh').trigger('change');
 
+        loadProfile(page);
     });
 
     window.DlnaProfilePage = {
diff --git a/dashboard-ui/scripts/dlnaprofiles.js b/dashboard-ui/scripts/dlnaprofiles.js
index ddcaeeee5b..cbef2aa1ae 100644
--- a/dashboard-ui/scripts/dlnaprofiles.js
+++ b/dashboard-ui/scripts/dlnaprofiles.js
@@ -104,7 +104,7 @@
 
     }
 
-    $(document).on('pageshow', "#dlnaProfilesPage", function () {
+    $(document).on('pageshowready', "#dlnaProfilesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/scripts/dlnaserversettings.js b/dashboard-ui/scripts/dlnaserversettings.js
index 264990691e..bd666c6504 100644
--- a/dashboard-ui/scripts/dlnaserversettings.js
+++ b/dashboard-ui/scripts/dlnaserversettings.js
@@ -17,23 +17,6 @@
         Dashboard.hideLoadingMsg();
     }
 
-    $(document).on('pageshow', "#dlnaServerSettingsPage", function () {
-
-        Dashboard.showLoadingMsg();
-
-        var page = this;
-
-        var promise1 = ApiClient.getNamedConfiguration("dlna");
-        var promise2 = ApiClient.getUsers();
-
-        $.when(promise1, promise2).done(function (response1, response2) {
-
-            loadPage(page, response1[0], response2[0]);
-
-        });
-
-    });
-
     function onSubmit() {
 
         Dashboard.showLoadingMsg();
@@ -56,8 +39,25 @@
         return false;
     }
 
-    window.DlnaServerSettingsPage = {
-        onSubmit: onSubmit
-    };
+    $(document).on('pageinitpdepends', "#dlnaServerSettingsPage", function () {
+
+        $('.dlnaServerSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
+
+    }).on('pageshowready', "#dlnaServerSettingsPage", function () {
+
+        Dashboard.showLoadingMsg();
+
+        var page = this;
+
+        var promise1 = ApiClient.getNamedConfiguration("dlna");
+        var promise2 = ApiClient.getUsers();
+
+        $.when(promise1, promise2).done(function (response1, response2) {
+
+            loadPage(page, response1[0], response2[0]);
+
+        });
+
+    });
 
 })(jQuery, document, window);
diff --git a/dashboard-ui/scripts/dlnasettings.js b/dashboard-ui/scripts/dlnasettings.js
index e32e771575..057622b1de 100644
--- a/dashboard-ui/scripts/dlnasettings.js
+++ b/dashboard-ui/scripts/dlnasettings.js
@@ -9,22 +9,8 @@
         Dashboard.hideLoadingMsg();
     }
 
-    $(document).on('pageshow', "#dlnaSettingsPage", function () {
-
-        Dashboard.showLoadingMsg();
-
-        var page = this;
-
-        ApiClient.getNamedConfiguration("dlna").done(function (config) {
-
-            loadPage(page, config);
-
-        });
-
-    });
-    
     function onSubmit() {
-        
+
         Dashboard.showLoadingMsg();
 
         var form = this;
@@ -42,8 +28,22 @@
         return false;
     }
 
-    window.DlnaSettingsPage = {
-        onSubmit: onSubmit
-    };
+    $(document).on('pageinitdepends', "#dlnaSettingsPage", function () {
+
+        $('.dlnaSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
+
+    }).on('pageshowready', "#dlnaSettingsPage", function () {
+
+        Dashboard.showLoadingMsg();
+
+        var page = this;
+
+        ApiClient.getNamedConfiguration("dlna").done(function (config) {
+
+            loadPage(page, config);
+
+        });
+
+    });
 
 })(jQuery, document, window);
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index fcd2548845..0070a15a8c 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -5,19 +5,39 @@
         $('#chkEnableDebugEncodingLogging', page).checked(config.EnableDebugLogging).checkboxradio('refresh');
         $('#chkEnableThrottle', page).checked(config.EnableThrottling).checkboxradio('refresh');
 
-        $('.radioEncodingQuality', page).each(function() {
+        $('.radioEncodingQuality', page).each(function () {
 
             this.checked = config.EncodingQuality == this.value;
 
         }).checkboxradio('refresh');
-        
+
         $('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
         $('#txtTranscodingTempPath', page).val(config.TranscodingTempPath || '');
 
         Dashboard.hideLoadingMsg();
     }
 
-    $(document).on('pageinit', "#encodingSettingsPage", function () {
+    function onSubmit() {
+        Dashboard.showLoadingMsg();
+
+        var form = this;
+
+        ApiClient.getNamedConfiguration("encoding").done(function (config) {
+
+            config.EnableDebugLogging = $('#chkEnableDebugEncodingLogging', form).checked();
+            config.EncodingQuality = $('.radioEncodingQuality:checked', form).val();
+            config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
+            config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
+            config.EnableThrottling = $('#chkEnableThrottle', form).checked();
+
+            ApiClient.updateNamedConfiguration("encoding", config).done(Dashboard.processServerConfigurationUpdateResult);
+        });
+
+        // Disable default form submission
+        return false;
+    }
+
+    $(document).on('pageinitdepends', "#encodingSettingsPage", function () {
 
         var page = this;
 
@@ -41,7 +61,10 @@
             });
         });
 
-    }).on('pageshow', "#encodingSettingsPage", function () {
+        $('.encodingSettingsForm').off('submit', onSubmit).on('submit', onSubmit);
+
+
+    }).on('pageshowready', "#encodingSettingsPage", function () {
 
         Dashboard.showLoadingMsg();
 
@@ -54,28 +77,4 @@
         });
     });
 
-    window.EncodingSettingsPage = {
-
-        onSubmit: function () {
-
-            Dashboard.showLoadingMsg();
-
-            var form = this;
-
-            ApiClient.getNamedConfiguration("encoding").done(function (config) {
-
-                config.EnableDebugLogging = $('#chkEnableDebugEncodingLogging', form).checked();
-                config.EncodingQuality = $('.radioEncodingQuality:checked', form).val();
-                config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
-                config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
-                config.EnableThrottling = $('#chkEnableThrottle', form).checked();
-
-                ApiClient.updateNamedConfiguration("encoding", config).done(Dashboard.processServerConfigurationUpdateResult);
-            });
-
-            // Disable default form submission
-            return false;
-        }
-    };
-
 })(jQuery, document, window);
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 50cf34a230..bc4a8491e2 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -520,6 +520,12 @@
 
         ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) {
 
+            if (items.length == 1) {
+
+                Dashboard.navigate(LibraryBrowser.getHref(items[0], context));
+                return;
+            }
+
             var ids = items.map(function (i) {
                 return i.Id;
             });
diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js
index 9a9478d469..81dfcc0e48 100644
--- a/dashboard-ui/scripts/librarysettings.js
+++ b/dashboard-ui/scripts/librarysettings.js
@@ -20,7 +20,30 @@
         Dashboard.hideLoadingMsg();
     }
 
-    $(document).on('pageshow', "#librarySettingsPage", function () {
+    function onSubmit() {
+        Dashboard.showLoadingMsg();
+
+        var form = this;
+
+        ApiClient.getServerConfiguration().done(function (config) {
+
+            config.ItemsByNamePath = $('#txtItemsByNamePath', form).val();
+
+            config.SeasonZeroDisplayName = $('#txtSeasonZeroName', form).val();
+
+            config.EnableRealtimeMonitor = $('#chkEnableRealtimeMonitor', form).checked();
+
+            config.EnableAudioArchiveFiles = $('#chkEnableAudioArchiveFiles', form).checked();
+            config.EnableVideoArchiveFiles = $('#chkEnableVideoArchiveFiles', form).checked();
+
+            ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
+        });
+
+        // Disable default form submission
+        return false;
+    }
+
+    $(document).on('pageshowready', "#librarySettingsPage", function () {
 
         Dashboard.showLoadingMsg();
 
@@ -32,7 +55,7 @@
 
         });
 
-    }).on('pageinit', "#librarySettingsPage", function () {
+    }).on('pageinitdepends', "#librarySettingsPage", function () {
 
         var page = this;
 
@@ -55,36 +78,8 @@
                 instruction: Globalize.translate('HeaderSelectImagesByNamePathHelp')
             });
         });
+
+        $('.librarySettingsForm').off('submit', onSubmit).on('submit', onSubmit);
     });
 
-    function librarySettingsPage() {
-
-        var self = this;
-
-        self.onSubmit = function () {
-            Dashboard.showLoadingMsg();
-
-            var form = this;
-
-            ApiClient.getServerConfiguration().done(function (config) {
-
-                config.ItemsByNamePath = $('#txtItemsByNamePath', form).val();
-
-                config.SeasonZeroDisplayName = $('#txtSeasonZeroName', form).val();
-
-                config.EnableRealtimeMonitor = $('#chkEnableRealtimeMonitor', form).checked();
-
-                config.EnableAudioArchiveFiles = $('#chkEnableAudioArchiveFiles', form).checked();
-                config.EnableVideoArchiveFiles = $('#chkEnableVideoArchiveFiles', form).checked();
-
-                ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
-            });
-
-            // Disable default form submission
-            return false;
-        };
-    }
-
-    window.LibrarySettingsPage = new librarySettingsPage();
-
 })(jQuery, document, window);
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 2f45aac62b..b4a7828dff 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -186,7 +186,7 @@
 
                 if (canPlayAac && $.browser.safari) {
                     profile.TranscodingProfiles.push({
-                        Container: 'aac',
+                        Container: 'ts',
                         Type: 'Audio',
                         AudioCodec: 'aac',
                         Context: 'Streaming',
@@ -448,6 +448,15 @@
 
         self.canPlayNativeHls = function () {
 
+            // Don't use HLS on android 4.4, regardless of what the browser reports
+            if ($.browser.android) {
+                var agent = navigator.userAgent.toLowerCase();
+
+                if (agent.indexOf('android 4.4') != -1) {
+                    return false;
+                }
+            }
+
             var media = document.createElement('video');
 
             // safari
@@ -1597,9 +1606,9 @@
         self._canPlayWebm = null;
         self.canPlayWebm = function () {
 
-        	if (self._canPlayWebm == null) {
-        		self._canPlayWebm = document.createElement('video').canPlayType('video/webm').replace(/no/, '');
-        	}
+            if (self._canPlayWebm == null) {
+                self._canPlayWebm = document.createElement('video').canPlayType('video/webm').replace(/no/, '');
+            }
             return self._canPlayWebm;
         };
 
@@ -1699,111 +1708,111 @@
 
 })(document, setTimeout, clearTimeout, screen, window.appStorage, $, setInterval, window);
 
-(function(){
+(function () {
 
-	function htmlMediaRenderer(type) {
+    function htmlMediaRenderer(type) {
 
-		var mediaElement;
-		var self = this;
+        var mediaElement;
+        var self = this;
 
-		function onEnded() {
-			$(self).trigger('ended');
-		}
+        function onEnded() {
+            $(self).trigger('ended');
+        }
 
-		function onTimeUpdate() {
-			$(self).trigger('timeupdate');
-		}
+        function onTimeUpdate() {
+            $(self).trigger('timeupdate');
+        }
 
-		function onVolumeChange() {
-			$(self).trigger('volumechange');
-		}
+        function onVolumeChange() {
+            $(self).trigger('volumechange');
+        }
 
-		function onOneAudioPlaying() {
-			$('.mediaPlayerAudioContainer').hide();
-		}
+        function onOneAudioPlaying() {
+            $('.mediaPlayerAudioContainer').hide();
+        }
 
-		function onPlaying() {
-			$(self).trigger('playing');
-		}
+        function onPlaying() {
+            $(self).trigger('playing');
+        }
 
-		function onPlay() {
-			$(self).trigger('play');
-		}
+        function onPlay() {
+            $(self).trigger('play');
+        }
 
-		function onPause() {
-			$(self).trigger('pause');
-		}
+        function onPause() {
+            $(self).trigger('pause');
+        }
 
-		function onClick() {
-			$(self).trigger('click');
-		}
+        function onClick() {
+            $(self).trigger('click');
+        }
 
-		function onDblClick() {
-			$(self).trigger('dblclick');
-		}
+        function onDblClick() {
+            $(self).trigger('dblclick');
+        }
 
-		function onError() {
+        function onError() {
 
-			var errorCode = this.error ? this.error.code : '';
+            var errorCode = this.error ? this.error.code : '';
             console.log('Media element error code: ' + errorCode);
 
             $(self).trigger('error');
-		}
+        }
 
-		function onLoadedMetadata() {
+        function onLoadedMetadata() {
 
-			// The IE video player won't autoplay without this
-	                if ($.browser.msie) {
-	                    this.play();
-	                }
-		}
+            // The IE video player won't autoplay without this
+            if ($.browser.msie) {
+                this.play();
+            }
+        }
 
-		function onOneVideoPlaying() {
+        function onOneVideoPlaying() {
 
-			var currentSrc = (this.currentSrc || '').toLowerCase();
+            var currentSrc = (this.currentSrc || '').toLowerCase();
 
-			var parts = currentSrc.split('#');
+            var parts = currentSrc.split('#');
 
-			if (parts.length > 1) {
+            if (parts.length > 1) {
 
-				var parts = parts[parts.length -1].split('=');
+                var parts = parts[parts.length - 1].split('=');
 
-				if (parts.length == 2) {
+                if (parts.length == 2) {
 
-					var startPositionInSeekParam = parseFloat(parts[1]);
+                    var startPositionInSeekParam = parseFloat(parts[1]);
 
-					// Appending #t=xxx to the query string doesn't seem to work with HLS
-	                if (startPositionInSeekParam && currentSrc.indexOf('.m3u8') != -1) {
-	                    var element = this;
-	                    setTimeout(function () {
-	                        element.currentTime = startPositionInSeekParam;
-	                    }, 3000);
-	                }
-				}
-			}		
-         }
+                    // Appending #t=xxx to the query string doesn't seem to work with HLS
+                    if (startPositionInSeekParam && currentSrc.indexOf('.m3u8') != -1) {
+                        var element = this;
+                        setTimeout(function () {
+                            element.currentTime = startPositionInSeekParam;
+                        }, 3000);
+                    }
+                }
+            }
+        }
 
-		function createAudioElement() {
+        function createAudioElement() {
 
-			var elem = $('.mediaPlayerAudio');
+            var elem = $('.mediaPlayerAudio');
 
             if (!elem.length) {
-				var html = '';
+                var html = '';
 
-	            var requiresControls = !MediaPlayer.canAutoPlayAudio();
+                var requiresControls = !MediaPlayer.canAutoPlayAudio();
 
-	            if (requiresControls) {
-	                html += '<div class="mediaPlayerAudioContainer"><div class="mediaPlayerAudioContainerInner">';;
-	            } else {
-	                html += '<div class="mediaPlayerAudioContainer" style="display:none;"><div class="mediaPlayerAudioContainerInner">';;
-	            }
+                if (requiresControls) {
+                    html += '<div class="mediaPlayerAudioContainer"><div class="mediaPlayerAudioContainerInner">';;
+                } else {
+                    html += '<div class="mediaPlayerAudioContainer" style="display:none;"><div class="mediaPlayerAudioContainerInner">';;
+                }
 
-	            html += '<audio class="mediaPlayerAudio" crossorigin="anonymous" controls>';
-	            html += '</audio></div></div>';
+                html += '<audio class="mediaPlayerAudio" crossorigin="anonymous" controls>';
+                html += '</audio></div></div>';
 
-	            $(document.body).append(html);   
+                $(document.body).append(html);
 
-	            elem = $('.mediaPlayerAudio');         
+                elem = $('.mediaPlayerAudio');
             }
 
             return $(elem)
@@ -1815,11 +1824,11 @@
 	            .on('pause', onPause)
 	            .on('playing', onPlaying)
 	            .on('error', onError)[0];
-		}
+        }
 
-		function createVideoElement() {
+        function createVideoElement() {
 
-			var elem = $('.itemVideo');
+            var elem = $('.itemVideo');
 
             return $(elem)
             	.one('.loadedmetadata')
@@ -1831,62 +1840,62 @@
 	            .on('pause', onPause)
 	            .on('playing', onPlaying)
 	            .on('error', onError)[0];
-		}
+        }
 
-		self.currentTime = function(val) {
+        self.currentTime = function (val) {
 
-			if (mediaElement) {
-				if (val != null) {
-					mediaElement.currentTime = val;
-					return;	
-				}
+            if (mediaElement) {
+                if (val != null) {
+                    mediaElement.currentTime = val;
+                    return;
+                }
 
-				return mediaElement.currentTime;
-			}
-		};
+                return mediaElement.currentTime;
+            }
+        };
 
-		self.duration = function(val) {
+        self.duration = function (val) {
 
-			if (mediaElement) {
-				return mediaElement.duration;
-			}
+            if (mediaElement) {
+                return mediaElement.duration;
+            }
 
-			return null;
-		};
+            return null;
+        };
 
-		self.pause = function() {
-			if (mediaElement) {
-				mediaElement.pause();
-			}
-		};
+        self.pause = function () {
+            if (mediaElement) {
+                mediaElement.pause();
+            }
+        };
 
-		self.unpause = function() {
-			if (mediaElement) {
-				mediaElement.play();
-			}
-		};
+        self.unpause = function () {
+            if (mediaElement) {
+                mediaElement.play();
+            }
+        };
 
-		self.volume = function(val) {
-			if (mediaElement) {
-				if (val != null) {
-					mediaElement.volume = val;
-					return;	
-				}
+        self.volume = function (val) {
+            if (mediaElement) {
+                if (val != null) {
+                    mediaElement.volume = val;
+                    return;
+                }
 
-				return mediaElement.volume;
-			}
-		};
+                return mediaElement.volume;
+            }
+        };
 
-		self.setCurrentSrc = function(val) {
+        self.setCurrentSrc = function (val) {
 
-			var elem = mediaElement;
+            var elem = mediaElement;
 
-			if (!elem) {
-				return;
-			}
+            if (!elem) {
+                return;
+            }
 
-			if (!val) {
-				elem.src = null;
+            if (!val) {
+                elem.src = null;
                 elem.src = "";
 
                 // When the browser regains focus it may start auto-playing the last video
@@ -1895,67 +1904,67 @@
                     elem.play();
                 }
 
-                return;    
-			}
+                return;
+            }
 
-			elem.src = val;
+            elem.src = val;
 
-			if (elem.tagName.toLowerCase() == 'audio') {
-				elem.play();
-			}
-			else {
+            if (elem.tagName.toLowerCase() == 'audio') {
+                elem.play();
+            }
+            else {
 
-				$(elem).one("loadedmetadata.mediaplayerevent", onLoadedMetadata);
-			}
-		};
+                $(elem).one("loadedmetadata.mediaplayerevent", onLoadedMetadata);
+            }
+        };
 
-		self.currentSrc = function() {
-			if (mediaElement) {
-				return mediaElement.currentSrc;
-			}
-		};
+        self.currentSrc = function () {
+            if (mediaElement) {
+                return mediaElement.currentSrc;
+            }
+        };
 
-		self.paused = function() {
+        self.paused = function () {
 
-			if (mediaElement) {
-				return mediaElement.paused;
-			}
+            if (mediaElement) {
+                return mediaElement.paused;
+            }
 
-			return false;
-		};
+            return false;
+        };
 
-		self.destroy = function() {
+        self.destroy = function () {
 
-			self.setCurrentSrc(null);
+            self.setCurrentSrc(null);
 
-			var elem = mediaElement;
+            var elem = mediaElement;
 
-			if (elem) {
+            if (elem) {
 
-				$(elem).off();
+                $(elem).off();
 
-				if (elem.tagName.toLowerCase() != 'audio') {
-					$(elem).remove();
+                if (elem.tagName.toLowerCase() != 'audio') {
+                    $(elem).remove();
                 }
-			}     
-		};
+            }
+        };
 
-		self.setPoster = function(url) {
-			var elem = mediaElement;
+        self.setPoster = function (url) {
+            var elem = mediaElement;
 
-			if (elem) {
-				elem.poster = url;
-			}  
-		};
+            if (elem) {
+                elem.poster = url;
+            }
+        };
 
-		if (type == 'audio') {
-			mediaElement = createAudioElement();
-		}
-		else {
-			mediaElement = createVideoElement();
-		}
-	}
+        if (type == 'audio') {
+            mediaElement = createAudioElement();
+        }
+        else {
+            mediaElement = createVideoElement();
+        }
+    }
 
-	window.HtmlMediaRenderer = htmlMediaRenderer;
+    window.HtmlMediaRenderer = htmlMediaRenderer;
 
 })();
\ No newline at end of file
diff --git a/dashboard-ui/scripts/metadatanfo.js b/dashboard-ui/scripts/metadatanfo.js
index 7438981e98..b7c51a1f2f 100644
--- a/dashboard-ui/scripts/metadatanfo.js
+++ b/dashboard-ui/scripts/metadatanfo.js
@@ -1,7 +1,7 @@
 (function ($, document, window) {
 
     var metadataKey = "xbmcmetadata";
-    
+
     function loadPage(page, config, users) {
 
         var html = '<option value="" selected="selected"></option>';
@@ -19,7 +19,31 @@
         Dashboard.hideLoadingMsg();
     }
 
-    $(document).on('pageshow', "#metadataNfoPage", function () {
+    function onSubmit() {
+        Dashboard.showLoadingMsg();
+
+        var form = this;
+
+        ApiClient.getNamedConfiguration(metadataKey).done(function (config) {
+
+            config.UserId = $('#selectUser', form).val() || null;
+            config.ReleaseDateFormat = $('#selectReleaseDateFormat', form).val();
+            config.SaveImagePathsInNfo = $('#chkSaveImagePaths', form).checked();
+            config.EnablePathSubstitution = $('#chkEnablePathSubstitution', form).checked();
+            config.EnableExtraThumbsDuplication = $('#chkEnableExtraThumbs', form).checked();
+
+            ApiClient.updateNamedConfiguration(metadataKey, config).done(Dashboard.processServerConfigurationUpdateResult);
+        });
+
+        // Disable default form submission
+        return false;
+    }
+
+    $(document).on('pageinitdepends', "#metadataNfoPage", function () {
+
+        $('.metadataNfoForm').off('submit', onSubmit).on('submit', onSubmit);
+
+    }).on('pageshowready', "#metadataNfoPage", function () {
 
         Dashboard.showLoadingMsg();
 
@@ -34,28 +58,4 @@
         });
     });
 
-    window.NfoMetadataPage = {
-
-        onSubmit: function () {
-
-            Dashboard.showLoadingMsg();
-
-            var form = this;
-
-            ApiClient.getNamedConfiguration(metadataKey).done(function (config) {
-
-                config.UserId = $('#selectUser', form).val() || null;
-                config.ReleaseDateFormat = $('#selectReleaseDateFormat', form).val();
-                config.SaveImagePathsInNfo = $('#chkSaveImagePaths', form).checked();
-                config.EnablePathSubstitution = $('#chkEnablePathSubstitution', form).checked();
-                config.EnableExtraThumbsDuplication = $('#chkEnableExtraThumbs', form).checked();
-
-                ApiClient.updateNamedConfiguration(metadataKey, config).done(Dashboard.processServerConfigurationUpdateResult);
-            });
-
-            // Disable default form submission
-            return false;
-        }
-    };
-
 })(jQuery, document, window);
diff --git a/dashboard-ui/scripts/scheduledtaskpage.js b/dashboard-ui/scripts/scheduledtaskpage.js
index ec26e4c35d..fc94e69da5 100644
--- a/dashboard-ui/scripts/scheduledtaskpage.js
+++ b/dashboard-ui/scripts/scheduledtaskpage.js
@@ -1,10 +1,5 @@
 var ScheduledTaskPage = {
 
-    onPageShow: function () {
-
-        ScheduledTaskPage.refreshScheduledTask();
-    },
-
     refreshScheduledTask: function () {
         Dashboard.showLoadingMsg();
 
@@ -154,7 +149,7 @@
 
         $('#selectTriggerType', page).val('DailyTrigger').trigger('change').selectmenu('refresh');
 
-        $('#popupAddTrigger', page).on("popupafteropen",function() {
+        $('#popupAddTrigger', page).on("popupafteropen", function () {
             $('#addTriggerForm input:first', this).focus();
         }).popup("open").on("popupafterclose", function () {
 
@@ -162,35 +157,6 @@
             $(this).off("popupafterclose");
         });
     },
-    
-    onSubmit: function() {
-        
-        ScheduledTaskPage.addTrigger();
-
-        return false;
-    },
-
-    addTrigger: function () {
-
-        Dashboard.showLoadingMsg();
-
-        var id = getParameterByName('id');
-
-        ApiClient.getScheduledTask(id).done(function (task) {
-
-            task.Triggers.push(ScheduledTaskPage.getTriggerToAdd());
-
-            ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).done(function () {
-
-                $('#popupAddTrigger').popup('close');
-
-                ScheduledTaskPage.refreshScheduledTask();
-
-            });
-
-        });
-
-    },
 
     confirmDeleteTrigger: function (index) {
 
@@ -319,4 +285,39 @@
     }
 };
 
-$(document).on('pageshow', "#scheduledTaskPage", ScheduledTaskPage.onPageShow);
\ No newline at end of file
+(function () {
+
+    function onSubmit() {
+
+        Dashboard.showLoadingMsg();
+
+        var id = getParameterByName('id');
+
+        ApiClient.getScheduledTask(id).done(function (task) {
+
+            task.Triggers.push(ScheduledTaskPage.getTriggerToAdd());
+
+            ApiClient.updateScheduledTaskTriggers(task.Id, task.Triggers).done(function () {
+
+                $('#popupAddTrigger').popup('close');
+
+                ScheduledTaskPage.refreshScheduledTask();
+
+            });
+
+        });
+
+        return false;
+    }
+
+    $(document).on('pageinitdepends', "#scheduledTaskPage", function () {
+
+        $('.addTriggerForm').off('submit', onSubmit).on('submit', onSubmit);
+
+    }).on('pageshowready', "#scheduledTaskPage", function () {
+
+        ScheduledTaskPage.refreshScheduledTask();
+    });
+
+})();
+
diff --git a/dashboard-ui/scripts/scheduledtaskspage.js b/dashboard-ui/scripts/scheduledtaskspage.js
index 5de6c22dcb..da2c6d587b 100644
--- a/dashboard-ui/scripts/scheduledtaskspage.js
+++ b/dashboard-ui/scripts/scheduledtaskspage.js
@@ -179,17 +179,10 @@
         }
     }
 
-    $(document).on('pageshow', "#scheduledTasksPage", function () {
+    $(document).on('pageinitdepends', "#scheduledTasksPage", function () {
 
         var page = this;
 
-        Dashboard.showLoadingMsg();
-
-        startInterval();
-        reloadList(page);
-
-        $(ApiClient).on("websocketmessage", onWebSocketMessage).on("websocketopen", onWebSocketConnectionOpen);
-
         $('#divScheduledTasks', page).on('click', '.btnStartTask', function () {
 
             var button = this;
@@ -211,6 +204,17 @@
             });
         });
 
+    }).on('pageshowready', "#scheduledTasksPage", function () {
+
+        var page = this;
+
+        Dashboard.showLoadingMsg();
+
+        startInterval();
+        reloadList(page);
+
+        $(ApiClient).on("websocketmessage", onWebSocketMessage).on("websocketopen", onWebSocketConnectionOpen);
+
     }).on('pagehide', "#scheduledTasksPage", function () {
 
         var page = this;
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index 609c638803..8304967524 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -134,7 +134,7 @@
 
         if (createIfNeeded && !elem.length) {
 
-            var html = '<div class="searchResultsOverlay ui-page-theme-b">';
+            var html = '<div class="searchResultsOverlay ui-page-theme-b smoothScrollY">';
 
             html += '<div class="searchResultsContainer"><div class="itemsContainer"></div></div></div>';
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 14beae1460..803540cdd6 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1331,7 +1331,7 @@ var Dashboard = {
             PlayableMediaTypes: ['Audio', 'Video'],
 
             SupportedCommands: Dashboard.getSupportedRemoteCommands(),
-            SupportsPersistentIdentifier: AppInfo.isNativeApp,
+            SupportsPersistentIdentifier: AppInfo.isNativeApp === true,
             SupportsMediaControl: true,
             SupportedLiveMediaTypes: ['Audio', 'Video']
         };