From b0539387a003e36d6e88db47fad74b4f68552806 Mon Sep 17 00:00:00 2001 From: kingosticks Date: Thu, 26 Mar 2015 00:02:39 +0000 Subject: [PATCH 1/3] Update stop for Mopidy playback API v1.0 --- mopidy_musicbox_webclient/static/js/controls.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js index 7cf92442..a1f0504a 100644 --- a/mopidy_musicbox_webclient/static/js/controls.js +++ b/mopidy_musicbox_webclient/static/js/controls.js @@ -5,7 +5,7 @@ function playBrowsedTracks(addtoqueue, trackid) { //stop directly, for user feedback. if (addtoqueue == PLAY_ALL) { - mopidy.playback.stop(true); + mopidy.playback.stop(); mopidy.tracklist.clear(); } toast('Loading...'); @@ -97,7 +97,7 @@ function playTrack(addtoqueue) { //stop directly, for user feedback. If searchresults, also clear queue if (!addtoqueue || ((addtoqueue == PLAY_NOW) && (divid == 'search'))) { - mopidy.playback.stop(true); + mopidy.playback.stop(); mopidy.tracklist.clear(); } $('#popupTracks').popup('close'); @@ -179,7 +179,7 @@ function playTrackByUri(track_uri, playlist_uri) { } // Stop directly, for user feedback - mopidy.playback.stop(true); + mopidy.playback.stop(); mopidy.tracklist.clear(); //this is deprecated, remove when popuptracks is removed completly @@ -217,7 +217,7 @@ function playTrackByUri(track_uri, playlist_uri) { function playTrackQueueByUri(uri, playlisturi) { // console.log('playquuri'); //stop directly, for user feedback - mopidy.playback.stop(true); + mopidy.playback.stop(); $('#popupQueue').popup('close'); toast('Loading...'); @@ -280,7 +280,7 @@ function clearQueue() { */ function doShuffle() { - mopidy.playback.stop(true); + mopidy.playback.stop(); mopidy.tracklist.shuffle(); mopidy.playback.play(); } @@ -518,7 +518,7 @@ function playStreamUri(uri) { if (isServiceUri(nwuri) || isStreamUri(nwuri) || validUri(nwuri)) { toast('Playing...'); //stop directly, for user feedback - mopidy.playback.stop(true); + mopidy.playback.stop(); //hide ios/android keyboard document.activeElement.blur(); $("input").blur(); From cfa6225e44ffac70c7b8373138932c7089bf4638 Mon Sep 17 00:00:00 2001 From: kingosticks Date: Thu, 26 Mar 2015 00:07:01 +0000 Subject: [PATCH 2/3] Fixed browse popup not closing --- mopidy_musicbox_webclient/static/js/controls.js | 1 + 1 file changed, 1 insertion(+) diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js index a1f0504a..7353dfa2 100644 --- a/mopidy_musicbox_webclient/static/js/controls.js +++ b/mopidy_musicbox_webclient/static/js/controls.js @@ -8,6 +8,7 @@ function playBrowsedTracks(addtoqueue, trackid) { mopidy.playback.stop(); mopidy.tracklist.clear(); } + $('#popupBrowse').popup('close'); toast('Loading...'); trackid = typeof trackid !== 'undefined' ? trackid : $('#popupBrowse').data("track"); From 464707c61f3dd9196600bd942ed685cdc02c8e35 Mon Sep 17 00:00:00 2001 From: kingosticks Date: Thu, 26 Mar 2015 00:11:41 +0000 Subject: [PATCH 3/3] Update version and release date --- README.rst | 2 +- mopidy_musicbox_webclient/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 07d8004b..ec0ced72 100644 --- a/README.rst +++ b/README.rst @@ -53,7 +53,7 @@ Project resources Changelog ========= -v1.2 (25-3-2015) +v2.0 (26-3-2015) ---------------- - Pausing a stream will now actually stop it. - Fix keyboard shortcuts in some browsers. diff --git a/mopidy_musicbox_webclient/__init__.py b/mopidy_musicbox_webclient/__init__.py index 3be8152b..df3e7d3f 100644 --- a/mopidy_musicbox_webclient/__init__.py +++ b/mopidy_musicbox_webclient/__init__.py @@ -4,7 +4,7 @@ from mopidy import config, ext -__version__ = '1.0.4' +__version__ = '2.0.0' class MusicBoxExtension(ext.Extension):