Merge branch 'develop' into multi-songs

Conflicts:
	mopidy_musicbox_webclient/static/index.html
	mopidy_musicbox_webclient/static/js/controls.js

README.rst

@@ -53,6 +53,18 @@ Project resources
 Changelog
 =========
 
+v2.0 (26-3-2015)
+----------------
+- Pausing a stream will now actually stop it.
+- Fix keyboard shortcuts in some browsers.
+- Use relative path for script files to fix proxy support.
+- Description text for control icons.
+- Added consume and single playback modes.
+- Changed from a static webclient to a dynamic webapp.
+- New musicbox config setting to hide Musicbox specific content.
+- Added popup tracks menu to the Browse interface.
+- Fixed wrong jQuery version on some pages.
+
 v1.0.4
 -------------------
 

mopidy_musicbox_webclient/__init__.py

@@ -4,7 +4,7 @@ import os
 
 from mopidy import config, ext
 
-__version__ = '1.0.4'
+__version__ = '2.0.0'
 
 
 class MusicBoxExtension(ext.Extension):

mopidy_musicbox_webclient/static/index.html

@@ -304,8 +304,6 @@
         <label for="trackslider" disabled="disabled" class="ui-hidden-accessible">Position</label>
         <input id="trackslider" name="trackslider" data-mini="true" type="range" onchange="doSeekPos(this.value);" />
     </div>
-    <a onclick="return saveStreamUri(songdata.track.uri);" data-role="button">Add to saved streams</a>
-
 </div>
 <!-- /nowplaying -->
 

mopidy_musicbox_webclient/static/js/controls.js

@@ -5,11 +5,10 @@ function playBrowsedTracks(addtoqueue, trackid) {
 
     //stop directly, for user feedback.
     if (addtoqueue == PLAY_ALL) {
-        mopidy.playback.stop(true);
+        mopidy.playback.stop();
         mopidy.tracklist.clear();
     }
     $('#popupBrowse').popup('close');
-    $('#controlspopup').popup('close');
     toast('Loading...');
 
     trackid = typeof trackid !== 'undefined' ? trackid : $('#popupBrowse').data("track");
@@ -99,7 +98,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');
@@ -181,7 +180,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
@@ -219,7 +218,7 @@ function playTrackByUri(track_uri, playlist_uri) {
 function playTrackQueueByTlid(uri, tlid) {
     //    console.log('playquuri');
     //stop directly, for user feedback
-    mopidy.playback.stop(true);
+    mopidy.playback.stop();
     $('#popupQueue').popup('close');
     toast('Loading...');
 
@@ -274,7 +273,7 @@ function clearQueue() {
  */
 
 function doShuffle() {
-    mopidy.playback.stop(true);
+    mopidy.playback.stop();
     mopidy.tracklist.shuffle();
     mopidy.playback.play();
 }
@@ -512,7 +511,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();