diff --git a/flatclient/index.html b/flatclient/index.html
index 5fd239f..8e85f5d 100755
--- a/flatclient/index.html
+++ b/flatclient/index.html
@@ -51,7 +51,7 @@
-
+
diff --git a/flatclient/js/gui.js b/flatclient/js/gui.js
index f9d41c2..3779d91 100755
--- a/flatclient/js/gui.js
+++ b/flatclient/js/gui.js
@@ -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();
+ } );
});