diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index e50486156..58177b2b5 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -4,7 +4,7 @@ ${TitlePlugins} -
+
diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html index 6e1fc2b1e..e06640b3e 100644 --- a/dashboard-ui/edititemimages.html +++ b/dashboard-ui/edititemimages.html @@ -4,7 +4,7 @@ Emby -
+
@@ -60,7 +60,7 @@
-
+

${HeaderAddUpdateImage}

${LabelJpgPngOnly}

@@ -146,10 +146,6 @@
- -
diff --git a/dashboard-ui/plugincatalog.html b/dashboard-ui/plugincatalog.html index 7a4cad577..931f98b01 100644 --- a/dashboard-ui/plugincatalog.html +++ b/dashboard-ui/plugincatalog.html @@ -4,7 +4,7 @@ ${TitlePlugins} -
+
diff --git a/dashboard-ui/scripts/edititemimages.js b/dashboard-ui/scripts/edititemimages.js index 16dfd2e0a..2a8d8cfde 100644 --- a/dashboard-ui/scripts/edititemimages.js +++ b/dashboard-ui/scripts/edititemimages.js @@ -440,39 +440,38 @@ reload(page); } + function onSubmit() { + var file = currentFile; + + if (!file) { + return false; + } + + if (file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/jpeg") { + return false; + } + + Dashboard.showLoadingMsg(); + + var page = $.mobile.activePage; + + var imageType = $('#selectImageType', page).val(); + + ApiClient.uploadItemImage(currentItem.Id, imageType, file).done(function () { + + $('#uploadImage', page).val('').trigger('change'); + $('#popupUpload', page).popup("close"); + processImageChangeResult(page); + + }); + + return false; + } + function editItemImages() { var self = this; - self.onSubmit = function () { - - var file = currentFile; - - if (!file) { - return false; - } - - if (file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/jpeg") { - return false; - } - - Dashboard.showLoadingMsg(); - - var page = $.mobile.activePage; - - var imageType = $('#selectImageType', page).val(); - - ApiClient.uploadItemImage(currentItem.Id, imageType, file).done(function () { - - $('#uploadImage', page).val('').trigger('change'); - $('#popupUpload', page).popup("close"); - processImageChangeResult(page); - - }); - - return false; - }; - self.deleteImage = function (type, index) { var page = $.mobile.activePage; @@ -515,7 +514,7 @@ window.EditItemImagesPage = new editItemImages(); - $(document).on('pageinit', "#editItemImagesPage", function () { + $(document).on('pageinitdepends', "#editItemImagesPage", function () { var page = this; @@ -567,7 +566,10 @@ reloadBrowsableImages(page); }); - }).on('pagebeforeshow', "#editItemImagesPage", function () { + $('.uploadItemImageForm').off('submit', onSubmit).on('submit', onSubmit); + + + }).on('pageshown', "#editItemImagesPage", function () { var page = this; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 7d2861314..5e7d57f7a 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -595,9 +595,14 @@ requiresLibraryMenuRefresh = true; initializeApiClient(apiClient); - }).on('localusersignedin localusersignedout', function () { + }).on('localusersignedin', function () { requiresLibraryMenuRefresh = true; + + }).on('localusersignedout', function () { + + $('.viewMenuBar').remove(); + requiresLibraryMenuRefresh = true; }); $(function () { diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 5902e88e4..8e6c0102e 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -1083,6 +1083,11 @@ return s.Type == 'Subtitle'; }); + // Reports of stuttering with h264 stream copy in IE + if (streamInfo.playMethod == 'Transcode' && videoUrl.indexOf('.m3u8') == -1) { + videoUrl += 'EnableAutoStreamCopy=false'; + } + var posterCode = self.getPosterUrl(item); posterCode = posterCode ? (' poster="' + posterCode + '"') : ''; //======================================================================================> diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 049ee50f0..d090aecb3 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -771,6 +771,7 @@ var startPositionInSeekParam = startPosition ? (startPosition / 10000000) : 0; var seekParam = startPositionInSeekParam ? '#t=' + startPositionInSeekParam : ''; + var playMethod = 'Transcode'; if (type == 'Video') { @@ -778,6 +779,7 @@ if (mediaSource.enableDirectPlay) { mediaUrl = mediaSource.Path; + playMethod = 'DirectPlay'; } else { if (mediaSource.SupportsDirectStream) { @@ -789,6 +791,7 @@ }); mediaUrl += seekParam; + playMethod = 'DirectStream'; } else { startTimeTicksOffset = startPosition || 0; @@ -813,6 +816,7 @@ mediaUrl = mediaSource.Path; + playMethod = 'DirectPlay'; } else { var isDirectStream = mediaSource.SupportsDirectStream; @@ -827,6 +831,8 @@ api_key: ApiClient.accessToken() }); mediaUrl += "&static=true" + seekParam; + + playMethod = 'DirectStream'; } else { contentType = 'audio/' + mediaSource.TranscodingContainer; @@ -842,7 +848,8 @@ url: mediaUrl, contentType: contentType, startTimeTicksOffset: startTimeTicksOffset, - startPositionInSeekParam: startPositionInSeekParam + startPositionInSeekParam: startPositionInSeekParam, + playMethod: playMethod }; }; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 579e41bf6..9c591f539 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -208,11 +208,16 @@ var Dashboard = { function onLogoutDone() { - var loginPage = !Dashboard.isConnectMode() ? - 'login.html' : - 'connectlogin.html'; + var loginPage = 'login.html'; - window.location.href = loginPage; + if (Dashboard.isConnectMode()) { + loginPage = 'connectlogin.html'; + window.ApiClient = null; + } else { + + } + + Dashboard.navigate(loginPage); } if (logoutWithServer === false) { @@ -1511,7 +1516,7 @@ var AppInfo = {}; function setAppInfo() { - if (isTouchDevice()) { + if (isTouchDevice() && $.browser.mobile) { AppInfo.isTouchPreferred = true; } diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js index 0592698f2..37115d56a 100644 --- a/dashboard-ui/scripts/wizardsettings.js +++ b/dashboard-ui/scripts/wizardsettings.js @@ -72,24 +72,23 @@ }); } - $(document).on('pageshow', "#wizardSettingsPage", function () { + function onSubmit() { + var form = this; + + save(form); + + return false; + } + + $(document).on('pageinitdepends', "#wizardSettingsPage", function () { + + $('.wizardSettingsForm', page).off('submit', onSubmit).on('submit', onSubmit); + + }).on('pageshown', "#wizardSettingsPage", function () { var page = this; reload(page); }); - window.WizardSettingsPage = { - - onSubmit: function () { - - var form = this; - - save(form); - - return false; - } - - }; - })(jQuery, document, window); diff --git a/dashboard-ui/scripts/wizarduserpage.js b/dashboard-ui/scripts/wizarduserpage.js index d02b460aa..76fa74d88 100644 --- a/dashboard-ui/scripts/wizarduserpage.js +++ b/dashboard-ui/scripts/wizarduserpage.js @@ -48,21 +48,19 @@ }).done(onUpdateUserComplete); } - function wizardUserPage() { + function onSubmit() { + var form = this; - var self = this; + submit(form); - self.onSubmit = function () { - var form = this; - - - submit(form); - - return false; - }; + return false; } - $(document).on('pageshow', "#wizardUserPage", function () { + $(document).on('pageinitdepends', "#wizardUserPage", function () { + + $('.wizardUserForm').off('submit', onSubmit).on('submit', onSubmit); + + }).on('pageshown', "#wizardUserPage", function () { Dashboard.showLoadingMsg(); @@ -80,6 +78,4 @@ }); - window.WizardUserPage = new wizardUserPage(); - })(jQuery, document, window); \ No newline at end of file diff --git a/dashboard-ui/thirdparty/cordova/chromecast.js b/dashboard-ui/thirdparty/cordova/chromecast.js index 984280731..de5aa67da 100644 --- a/dashboard-ui/thirdparty/cordova/chromecast.js +++ b/dashboard-ui/thirdparty/cordova/chromecast.js @@ -166,13 +166,13 @@ self.unpause = function () { sendMessageToDevice({ - command: 'unpause' + command: 'Unpause' }); }; self.pause = function () { sendMessageToDevice({ - command: 'pause' + command: 'Pause' }); }; @@ -222,7 +222,7 @@ self.stop = function () { sendMessageToDevice({ - command: 'stop' + command: 'Stop' }); }; @@ -236,7 +236,7 @@ self.mute = function () { sendMessageToDevice({ - command: 'mute' + command: 'Mute' }); }; @@ -383,7 +383,7 @@ sendMessageToDevice({ options: { - volume: (vol / 100) + volume: vol }, command: 'SetVolume' }); diff --git a/dashboard-ui/wizardsettings.html b/dashboard-ui/wizardsettings.html index c86b9d207..36ae929c0 100644 --- a/dashboard-ui/wizardsettings.html +++ b/dashboard-ui/wizardsettings.html @@ -4,14 +4,15 @@ Emby -
+

- ${LabelConfigureSettings}

+ ${LabelConfigureSettings} +
@@ -45,9 +46,6 @@
-
diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html index 9648d5d69..af05f3a5e 100644 --- a/dashboard-ui/wizarduser.html +++ b/dashboard-ui/wizarduser.html @@ -4,14 +4,15 @@ Emby -
+
- +

- ${TellUsAboutYourself}

+ ${TellUsAboutYourself} +

${UserProfilesIntro}

@@ -23,7 +24,7 @@

${HeaderOptionalLinkEmbyAccount}

-
+
  • @@ -43,10 +44,6 @@
- -