diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 31050826e9..68996d04d0 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -28,14 +28,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-selector", + "homepage": "https://github.com/polymerelements/iron-selector", "_release": "1.0.2", "_resolution": { "type": "version", "tag": "v1.0.2", "commit": "ea22d91d11ba6f72c01faa952d5e600f9d1773cf" }, - "_source": "git://github.com/PolymerElements/iron-selector.git", + "_source": "git://github.com/polymerelements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-selector" + "_originalSource": "polymerelements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/cordova/android/vlcplayer.js b/dashboard-ui/cordova/android/vlcplayer.js index e66f780a24..2cea11be71 100644 --- a/dashboard-ui/cordova/android/vlcplayer.js +++ b/dashboard-ui/cordova/android/vlcplayer.js @@ -5,35 +5,35 @@ var self = this; function onEnded() { - $(self).trigger('ended'); + Events.trigger(self, 'ended'); } function onTimeUpdate() { - $(self).trigger('timeupdate'); + Events.trigger(self, 'timeupdate'); } function onVolumeChange() { - $(self).trigger('volumechange'); + Events.trigger(self, 'volumechange'); } function onPlaying() { - $(self).trigger('playing'); + Events.trigger(self, 'playing'); } function onPlay() { - $(self).trigger('play'); + Events.trigger(self, 'play'); } function onPause() { - $(self).trigger('pause'); + Events.trigger(self, 'pause'); } function onClick() { - $(self).trigger('click'); + Events.trigger(self, 'click'); } function onDblClick() { - $(self).trigger('dblclick'); + Events.trigger(self, 'dblclick'); } function onError() { @@ -41,7 +41,7 @@ var errorCode = this.error ? this.error.code : ''; Logger.log('Media element error code: ' + errorCode); - $(self).trigger('error'); + Events.trigger(self, 'error'); } var playerState = {}; diff --git a/dashboard-ui/cordova/ios/orientation.js b/dashboard-ui/cordova/ios/orientation.js index 855aaff1a0..89ddea319a 100644 --- a/dashboard-ui/cordova/ios/orientation.js +++ b/dashboard-ui/cordova/ios/orientation.js @@ -7,7 +7,7 @@ // Try to make it react quicker to the orientation change doc.scrollTop(doc.scrollTop() + 1); - $('.libraryViewNav').filter(':visible').hide().show(); + $('paper-tabs').filter(':visible').hide().show(); } function onOrientationChange() { diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html index aba8a48f99..9c20226f6e 100644 --- a/dashboard-ui/nowplaying.html +++ b/dashboard-ui/nowplaying.html @@ -43,21 +43,21 @@ -
- - +
+ +
-
- +
+
-
-
+
+
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 7311fcaa19..f27461f521 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -115,16 +115,16 @@ var resumePosition = (item.UserData || {}).PlaybackPositionTicks || 0; - html += ''; + html += ''; buttonCount++; } if (commands.indexOf('trailer') != -1) { - html += ''; + html += ''; buttonCount++; } - html += ''; + html += ''; buttonCount++; html += ''; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 97f558f8f2..7a6b2d559c 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -482,7 +482,7 @@ } function showUserAtTop() { - return $.browser.mobile || AppInfo.isNativeApp; + return AppInfo.isNativeApp; } var requiresLibraryMenuRefresh = false; @@ -770,7 +770,7 @@ }); } - if (!$.browser.mobile) { + if (!AppInfo.isNativeApp) { darkDrawer = true; } } diff --git a/dashboard-ui/scripts/livetvprogram.js b/dashboard-ui/scripts/livetvprogram.js index 4992169abb..dcae97c64a 100644 --- a/dashboard-ui/scripts/livetvprogram.js +++ b/dashboard-ui/scripts/livetvprogram.js @@ -50,7 +50,7 @@ LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', page), item); - $(page).trigger('displayingitem', [{ + Events.trigger(page, 'displayingitem', [{ item: item, context: 'livetv' diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js index 9d880ecf76..134f26af8d 100644 --- a/dashboard-ui/scripts/moviesrecommended.js +++ b/dashboard-ui/scripts/moviesrecommended.js @@ -67,7 +67,7 @@ }); } - $('#recentlyAddedItems', page).html(html).lazyChildren().trigger('create'); + $('#recentlyAddedItems', page).html(html).lazyChildren(); }); } @@ -128,7 +128,7 @@ }); } - $('#resumableItems', page).html(html).lazyChildren().trigger('create'); + $('#resumableItems', page).html(html).lazyChildren(); }); } diff --git a/dashboard-ui/scripts/myprofile.js b/dashboard-ui/scripts/myprofile.js index 1f66052383..f475c28603 100644 --- a/dashboard-ui/scripts/myprofile.js +++ b/dashboard-ui/scripts/myprofile.js @@ -11,7 +11,7 @@ ApiClient.getUser(userId).done(function (user) { $('.username', page).html(user.Name); - $('#uploadUserImage', page).val('').trigger('change'); + Events.trigger($('#uploadUserImage', page).val('')[0], 'change'); Dashboard.setPageTitle(user.Name); diff --git a/dashboard-ui/scripts/nowplayingbar.js b/dashboard-ui/scripts/nowplayingbar.js index 2b69f8dac9..1039c2846a 100644 --- a/dashboard-ui/scripts/nowplayingbar.js +++ b/dashboard-ui/scripts/nowplayingbar.js @@ -175,7 +175,7 @@ elem = $(getNowPlayingBarHtml()).insertBefore('#footerNotifications')[0]; - if ($.browser.safari && $.browser.mobile) { + if (($.browser.safari || !AppInfo.isNativeApp) && $.browser.mobile) { // Not handled well here. The wrong elements receive events, bar doesn't update quickly enough, etc. elem.classList.add('noMediaProgress'); } diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js index d6627314f9..e073295dc6 100644 --- a/dashboard-ui/scripts/nowplayingpage.js +++ b/dashboard-ui/scripts/nowplayingpage.js @@ -476,6 +476,20 @@ $('.videoButton', page).css('visibility', 'hidden'); } + if (playerInfo.isLocalPlayer && AppInfo.hasPhysicalVolumeButtons) { + $('.volumeButton', page).css('visibility', 'hidden'); + } else { + $('.volumeButton', page).css('visibility', 'visible'); + } + + if (playerInfo.isLocalPlayer && AppInfo.hasPhysicalVolumeButtons && item && item.MediaType == 'Audio') { + $('.buttonsRow2', page).hide(); + $('.buttonsRow3', page).hide(); + } else { + $('.buttonsRow2', page).show(); + $('.buttonsRow3', page).show(); + } + updateNowPlayingInfo(page, state); } diff --git a/dashboard-ui/scripts/registrationservices.js b/dashboard-ui/scripts/registrationservices.js index f8a2ba3118..2b4de076ad 100644 --- a/dashboard-ui/scripts/registrationservices.js +++ b/dashboard-ui/scripts/registrationservices.js @@ -84,29 +84,29 @@ addRecurringFields: function (page, period) { - var formSelector = '.supporterForm'; + var form = page.querySelector('.supporterForm'); // Add recurring fields to form $("") .attr('value', $('#donateAmt', page).val()) - .appendTo(formSelector, page); + .appendTo(form); $("") - .appendTo(formSelector, page); + .appendTo(form); $("") - .appendTo(formSelector, page); + .appendTo(form); $("") - .appendTo(formSelector, page); + .appendTo(form); $("") - .appendTo(formSelector, page); + .appendTo(form); //change command for subscriptions $('#ppCmd', page).val('_xclick-subscriptions'); - $(formSelector, page).trigger('create'); + Events.trigger(form, 'create'); }, diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js index d7040fc807..2cbeb60c71 100644 --- a/dashboard-ui/scripts/remotecontrol.js +++ b/dashboard-ui/scripts/remotecontrol.js @@ -296,7 +296,7 @@ function firePlaybackEvent(name, session) { - $(player).trigger(name, [getPlayerState(session)]); + Events.trigger(player, name, [getPlayerState(session)]); } function onWebSocketConnectionChange() { diff --git a/dashboard-ui/scripts/scheduledtaskpage.js b/dashboard-ui/scripts/scheduledtaskpage.js index fc94e69da5..4b20783f1c 100644 --- a/dashboard-ui/scripts/scheduledtaskpage.js +++ b/dashboard-ui/scripts/scheduledtaskpage.js @@ -147,7 +147,7 @@ var page = $.mobile.activePage; - $('#selectTriggerType', page).val('DailyTrigger').trigger('change').selectmenu('refresh'); + Events.trigger($('#selectTriggerType', page).val('DailyTrigger').selectmenu('refresh')[0], 'change'); $('#popupAddTrigger', page).on("popupafteropen", function () { $('#addTriggerForm input:first', this).focus(); diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js index 629e4aeed7..90497c9fad 100644 --- a/dashboard-ui/scripts/syncactivity.js +++ b/dashboard-ui/scripts/syncactivity.js @@ -177,7 +177,8 @@ html += getSyncJobHtml(page, job, cardBoxCssClass, syncJobPage); } - var elem = $('.syncActivity', page).html(html).trigger('create').lazyChildren(); + var elem = $('.syncActivity', page).html(html).lazyChildren(); + Events.trigger(elem[0], 'create'); $('.btnJobMenu', elem).on('click', function () { showJobMenu(this); diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js index 0fa6b1d425..45aad23796 100644 --- a/dashboard-ui/scripts/tvgenres.js +++ b/dashboard-ui/scripts/tvgenres.js @@ -35,7 +35,7 @@ totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false - })).trigger('create'); + })); updateFilterControls(page); @@ -190,7 +190,7 @@ LibraryBrowser.getSavedViewSetting(viewkey).done(function (val) { if (val) { - $('#selectView', page).val(val).selectmenu('refresh').trigger('change'); + Events.trigger($('#selectView', page).val(val).selectmenu('refresh')[0], 'change'); } else { reloadItems(page); } diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js index c4b556ae33..1a7da5dc7e 100644 --- a/dashboard-ui/scripts/tvstudios.js +++ b/dashboard-ui/scripts/tvstudios.js @@ -1,23 +1,36 @@ (function ($, document) { // The base query options - var query = { + var data = {}; - SortBy: "SortName", - SortOrder: "Ascending", - IncludeItemTypes: "Series", - Recursive: true, - Fields: "DateCreated,ItemCounts", - StartIndex: 0 - }; + function getQuery() { + var key = getWindowUrl(); + var pageData = data[key]; + + if (!pageData) { + pageData = data[key] = { + query: { + SortBy: "SortName", + SortOrder: "Ascending", + IncludeItemTypes: "Series", + Recursive: true, + Fields: "DateCreated,ItemCounts", + StartIndex: 0 + } + }; + } + return pageData.query; + } function getSavedQueryKey() { - return 'tvstudios' + (query.ParentId || ''); + return 'tvstudios' + (getQuery().ParentId || ''); } function reloadItems(page) { + var query = getQuery(); + Dashboard.showLoadingMsg(); ApiClient.getStudios(Dashboard.getCurrentUserId(), query).done(function (result) { @@ -33,7 +46,7 @@ totalRecordCount: result.TotalRecordCount, viewButton: true, showLimit: false - })).trigger('create'); + })); updateFilterControls(page); @@ -46,7 +59,7 @@ showItemCounts: true, centerText: true, lazy: true - + }); var elem = page.querySelector('#items'); @@ -71,6 +84,8 @@ function updateFilterControls(page) { + var query = getQuery(); + $('.chkStandardFilter', page).each(function () { var filters = "," + (query.Filters || ""); @@ -89,6 +104,8 @@ $('.chkStandardFilter', this).on('change', function () { + var query = getQuery(); + var filterName = this.getAttribute('data-filter'); var filters = query.Filters || ""; @@ -105,6 +122,8 @@ }); $('#selectPageSize', page).on('change', function () { + var query = getQuery(); + query.Limit = parseInt(this.value); query.StartIndex = 0; reloadItems(page); @@ -112,6 +131,8 @@ }).on('pagebeforeshowready', "#tvStudiosPage", function () { + var query = getQuery(); + query.ParentId = LibraryMenu.getTopParentId(); var limit = LibraryBrowser.getDefaultPageSize(); diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css index 69ce60a343..b0f633fc48 100644 --- a/dashboard-ui/themes/ios.css +++ b/dashboard-ui/themes/ios.css @@ -145,7 +145,7 @@ h1, h1 a { } .bottomFab { - bottom: 70px; + bottom: 70px !important; } .sidebarLinkText { diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html index 4285182475..d500895c60 100644 --- a/dashboard-ui/thirdparty/emby-icons.html +++ b/dashboard-ui/thirdparty/emby-icons.html @@ -108,6 +108,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for + diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index cc117d115b..40b1a0c9b9 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -17114,6 +17114,7 @@ paper-ripple { +