Merge pull request #47 from m4dz/fix/disable-features

[feat] disable unstable features
cozy-labs · May 3, 2016 · 8a6c054 · 8a6c054
2 parents 7d4a9a5 + 2265c88
commit 8a6c054
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 37 deletions.
diff --git a/app/collections/tracks.js b/app/collections/tracks.js
@@ -16,11 +16,6 @@ const Tracks = Backbone.Collection.extend({
                 'upnext:reset': this.resetUpNext,
                 'upnext:addCurrentPlaylist': this.addCurrentPlaylistToUpNext
             });
-            this.listenTo(
-                application.appState,
-                'change:shuffle',
-                this.shuffleUpNext
-            );
         }
 
         // Remove a track from all it's playlist when he is destroyed
@@ -36,14 +31,6 @@ const Tracks = Backbone.Collection.extend({
         this.on('change:hidden', this.removeTrack, this);
     },
 
-    // UpNext : shuffle
-    shuffleUpNext(appState, shuffle) {
-        if (shuffle) {
-            this.reset(this.shuffle(), {silent:true});
-        }
-        this.sort();
-    },
-
     // UpNext : reset
     resetUpNext() {
         application.appState.set('currentTrack', undefined);
@@ -80,11 +67,7 @@ const Tracks = Backbone.Collection.extend({
     },
 
     comparator(model) {
-        if (this.type == 'upNext' && application.appState.get('shuffle')) {
-            return undefined;
-        } else {
-            return model.get('metas').title;
-        }
+        return model.get('metas').title;
     },
 
     sync(method, model, options) {

diff --git a/app/models/appState.js b/app/models/appState.js
@@ -6,7 +6,6 @@ const AppState = Backbone.Model.extend({
     defaults: {
         currentTrack: '',
         currentPlaylist: '',
-        shuffle: false,
         repeat: 'false', // can be 'false' / 'track' / 'playlist'
         currentVolume: 0.5,
         mute: false

diff --git a/app/styles/toolbar.styl b/app/styles/toolbar.styl
@@ -13,6 +13,9 @@ div[role='toolbar']
         padding-left: 16px
         padding-right: 16px
 
+        > div:not(:first-child)
+            margin-top: 8px
+
         .button
             cursor: pointer
             font-family: 'Source Sans Pro'
@@ -61,9 +64,6 @@ div[role='toolbar']
                 height: 100%
                 color: $text-light
 
-        #search
-            margin-top: 8px
-
         .input
             font-family: 'Source Sans Pro'
             font-style: italic

diff --git a/app/views/player.js b/app/views/player.js
@@ -17,7 +17,6 @@ const Player = Mn.LayoutView.extend({
         volumeBar: '#volume-bar',
         playButton: '#play',
         trackname: '#trackname',
-        shuffle: '#shuffle',
         repeat: '#repeat',
         speaker: '#speaker'
     },
@@ -28,7 +27,6 @@ const Player = Mn.LayoutView.extend({
         'click #next': 'next',
         'mousedown @ui.progressBar': 'skip',
         'mousedown @ui.volumeBar': 'changeVol',
-        'click @ui.shuffle': 'toggleShuffle',
         'click @ui.repeat': 'toggleRepeat',
         'click @ui.speaker': 'toggleVolume'
     },
@@ -181,13 +179,6 @@ const Player = Mn.LayoutView.extend({
         );
     },
 
-    toggleShuffle() {
-        application.channel.trigger('upnext:addCurrentPlaylist');
-        let shuffle = application.appState.get('shuffle');
-        application.appState.set('shuffle', !shuffle);
-        this.ui.shuffle.toggleClass('active', !shuffle);
-    },
-
     toggleRepeat() {
         let repeat = application.appState.get('repeat');
         switch (repeat) {

diff --git a/app/views/templates/player.jst b/app/views/templates/player.jst
@@ -38,11 +38,6 @@
         <p id="total-time">0:00</p>
     </div>
     <div class="controls">
-        <button id="shuffle">
-            <svg>
-                <use xlink:href="<%= require('../../assets/icons/shuffle-sm.svg') %>"/>
-            </svg>
-        </button>
         <button id="repeat">
             <svg>
                 <use xlink:href="<%= require('../../assets/icons/repeat-sm.svg') %>"/>

diff --git a/app/views/templates/toolbar.jst b/app/views/templates/toolbar.jst
@@ -1,4 +1,10 @@
 <div class="tools">
+    <div class="button" id="sync-files">
+        <svg>
+            <use xlink:href="<%= require('../../assets/icons/upload-sm.svg') %>"/>
+        </svg>
+        <p><%= t('sync with your files') %></p>
+    </div>
     <div class="button" id="import-sc">
         <svg>
             <use xlink:href="<%= require('../../assets/icons/stream-sm.svg') %>"/>

diff --git a/app/views/toolbar.js b/app/views/toolbar.js
@@ -1,4 +1,5 @@
 import Mn from 'backbone.marionette';
+import { syncFiles } from '../libs/file';
 import scdl from '../libs/soundcloud';
 import PlaylistsView from './playlists';
 import NotificationView from './notification';
@@ -21,6 +22,7 @@ const Toolbar = Mn.LayoutView.extend({
     },
 
     events: {
+        'click #sync-files': syncFiles,
         'click @ui.importSC': 'importStream',
         'click @ui.search': 'focusInput',
         'focusout @ui.importSC': 'focusoutImportSc',

diff --git a/package.json b/package.json
@@ -1,4 +1,4 @@
-{
+  {
   "name": "music",
   "version": "0.3.1",
   "description": "music description",
@@ -76,6 +76,9 @@
     },
     "Playlist": {
       "description": "Manage your playlist."
+    },
+    "Binary": {
+      "description": "Access your binary music files to stream them."
     }
   }
 }