From eeafc46d94989c5a33e3ca3cec30e67e13d66525 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 4 Jul 2014 15:17:22 -0400 Subject: [PATCH] add one year tolerance to movie lookups --- dashboard-ui/css/mediaplayer-video.css | 10 +++------- dashboard-ui/log.html | 2 +- dashboard-ui/scripts/librarylist.js | 10 +++++----- dashboard-ui/scripts/mediaplayer-video.js | 9 +-------- dashboard-ui/scripts/musicgenres.js | 2 +- dashboard-ui/supporter.html | 9 ++++++--- 6 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css index 0650100757..3c972cb618 100644 --- a/dashboard-ui/css/mediaplayer-video.css +++ b/dashboard-ui/css/mediaplayer-video.css @@ -24,9 +24,6 @@ background-color: #000; width: 100%; height: auto; - - /* Without this the buttons displayed over the video surface will not be clickable in safari. */ - -webkit-transform-style: preserve-3d } .videoControls { @@ -109,8 +106,7 @@ /* Fullscreen ***************************************/ -#videoPlayer, -.itemVideo { +#videoPlayer, .itemVideo { position: fixed !important; top: 0 !important; bottom: 0 !important; @@ -125,8 +121,8 @@ } /* Hack for safari because it doesn't allow clickable content over the video surface. */ -.itemVideo { (;top: 60px!important;); } -.itemVideo { [;top: 60px!important;]; } +.itemVideo { (;top: 9%!important;height: 91% !important;); } +.itemVideo { [;top: 9%!important;height: 91% !important;]; } #mediaPlayer .ui-slider-track, .nowPlayingBar .ui-slider-track, .nowPlayingPage .ui-slider-track { border-color: #2ad !important; diff --git a/dashboard-ui/log.html b/dashboard-ui/log.html index 8fab2e69de..81ab2abcf0 100644 --- a/dashboard-ui/log.html +++ b/dashboard-ui/log.html @@ -17,7 +17,7 @@

${HeaderServerLogFiles}

-
+
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 691a3efed1..85a715b444 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -219,6 +219,8 @@ var itemId = posterItem.getAttribute('data-itemid'); var commands = posterItem.getAttribute('data-commands').split(','); + $(posterItem).addClass('hasContextMenu'); + var promise1 = ApiClient.getItem(Dashboard.getCurrentUserId(), itemId); var promise2 = Dashboard.getCurrentUser(); @@ -272,6 +274,7 @@ var elem = $('.tapHoldMenu').popup({ positionTo: e.target }).trigger('create').popup("open").on("popupafterclose", function () { $(this).off("popupafterclose").remove(); + $(posterItem).removeClass('hasContextMenu'); }); @@ -352,11 +355,8 @@ var elems = '.backdropPosterItem,.smallBackdropPosterItem,.portraitPosterItem,.squarePosterItem,.miniBackdropPosterItem'; - if ($.browser.mobile) { - - this.off('contextmenu.posterItemMenu', elems) - .on('contextmenu.posterItemMenu', elems, onPosterItemTapHold); - } + this.off('contextmenu.posterItemMenu', elems) + .on('contextmenu.posterItemMenu', elems, onPosterItemTapHold); return this.off('.posterItemHoverMenu') .on('mouseenter.posterItemHoverMenu', elems, onHoverIn) diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 6480720090..eefe103152 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -1158,12 +1158,7 @@ volumeSlider.val(initialVolume).slider('refresh'); updateVolumeButtons(initialVolume); - video.on("loadstart.mediaplayerevent", function (e) { - - Dashboard.showLoadingMsg(); - - - }).on("volumechange.mediaplayerevent", function (e) { + video.on("volumechange.mediaplayerevent", function (e) { var vol = this.volume; @@ -1189,8 +1184,6 @@ }).on("playing.mediaplayerevent", function (e) { - Dashboard.hideLoadingMsg(); - $('#video-playButton', videoControls).hide(); $('#video-pauseButton', videoControls).show(); $("#play", videoElement).show().addClass("fadeOut"); diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js index f8c9ec7e30..e2adb1c476 100644 --- a/dashboard-ui/scripts/musicgenres.js +++ b/dashboard-ui/scripts/musicgenres.js @@ -43,7 +43,7 @@ html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - $('#items', page).html(html).trigger('create'); + $('#items', page).html(html).trigger('create').createPosterItemMenus(); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; diff --git a/dashboard-ui/supporter.html b/dashboard-ui/supporter.html index ac4326bafc..78a7248674 100644 --- a/dashboard-ui/supporter.html +++ b/dashboard-ui/supporter.html @@ -29,9 +29,12 @@ - - -

You can cancel at any time via your PayPal account

+
+ + +
${LabelAutomaticallyDonateHelp}
+
+