small updates

This commit is contained in:
woutervanwijk 2013-11-15 21:19:56 +01:00
parent 43d80e9a77
commit 6903cc4237
2 changed files with 18 additions and 8 deletions

View File

@ -51,7 +51,7 @@
<body>
<div data-role="page" id="page" class="ui-responsive-panel" data-theme="c">
<div data-role="panel" id="panel" data-position="left" data-theme="a" data-display="reveal"> <!-- data-position-fixed="true"> -->
<div data-role="panel" id="panel" data-position="left" data-theme="a" data-display="push" data-position-fixed="true">
<ul class="ui-listview mainNav" data-role="listview" data-theme="a">

View File

@ -508,10 +508,12 @@ $(document).ready(function(event) {
$('#normalFooter').click(
function() {
if(!$(event.target).is("#playimg"))
{return switchContent('nowPlaying')} }
{return switchContent('nowPlaying')} }
);
$('#nowPlayingpane, #controlspopupimage').click(
function() {return switchContent('current')}
$('#nowPlayingpane, #nowPlayingFooter, #controlspopupimage').click(
function() {
if(!$(event.target).is("#trackslider"))
return switchContent('current')}
);
$('#navEnterFullscreen').click(function(){
enterFullscreen();
@ -561,8 +563,16 @@ $(document).ready(function(event) {
$.event.special.swipe.durationThreshold = 500;
// swipe songinfo and panel
$( "#normalFooter" ).on( "swiperight", doPrevious );
$( "#normalFooter" ).on( "swipeleft", doNext );
$( "#page, #header, #panel, .pane" ).on( "swiperight", function() { $("#panel").panel("open") } );
$( "#page, #header, #panel, .pane" ).on( "swipeleft", function() { $("#panel").panel("close") });
$( "#normalFooter, #nowPlayingFooter" ).on( "swiperight", doPrevious );
$( "#normalFooter, #nowPlayingFooter" ).on( "swipeleft", doNext );
$( "#nowPlayingpane, .ui-body-c, #header, #panel, .pane" ).on( "swiperight", function() {
if(!$(event.target).is("#normalFooter") && !$(event.target).is("#nowPlayingFooter"))
$("#panel").panel("open");
event.stopImmediatePropagation();
} );
$( "#nowPlayingpane, .ui-body-c, #header, #panel, .pane" ).on( "swipeleft", function() {
if(!$(event.target).is("#normalFooter") && !$(event.target).is("#nowPlayingFooter"))
$("#panel").panel("close");
event.stopImmediatePropagation();
} );
});