Merge branch 'develop' into feature/album-directive

thisissoon · Jul 27, 2015 · 5826de9 · 5826de9
2 parents b9f2706 + a484b46
commit 5826de9
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 6 deletions.
diff --git a/app/js/player/directives/track.js b/app/js/player/directives/track.js
@@ -28,7 +28,8 @@ angular.module("FM.player.trackDirective", [
                 track: "=spotifyTrack",
                 current: "=",
                 user: "=",
-                timer: "=?"
+                timer: "=?",
+                playCount: "=?"
             },
             templateUrl: "partials/track.html",
             link: function($scope){

diff --git a/app/less/default/modules/controls.less b/app/less/default/modules/controls.less
@@ -27,6 +27,10 @@
     width: 129px;
 }
 
+.no-controls.controls {
+    min-width: 70px;
+}
+
 fm-slider {
     display: inline-block;
     height: max(@thumb-height, @track-height);

diff --git a/app/less/default/modules/footer.less b/app/less/default/modules/footer.less
@@ -29,4 +29,14 @@
         right: 0;
         width: @controls-width;
     }
+
+    .no-controls {
+        &.track {
+            right: 70px;
+        }
+
+        &.controls {
+            width: 70px;
+        }
+    }
 }
diff --git a/app/less/default/modules/track.less b/app/less/default/modules/track.less
@@ -139,6 +139,15 @@
     }
 }
 
+.track-plays {
+    .align-self(flex-end);
+
+    .footer &,
+    .queue & {
+        display: none;
+    }
+}
+
 .img-user {
     .size(36px, auto);
 }

diff --git a/app/less/mobile/modules/track.less b/app/less/mobile/modules/track.less
@@ -35,7 +35,7 @@
 .track-menu {
     .align-self(center);
     position: static;
-    min-width: 10px;
+    min-width: 15px;
     margin-bottom: 0;
     margin-top: 10px;
 
@@ -83,6 +83,17 @@
     }
 }
 
+.track-plays {
+    .align-self(center);
+    font-size: 0.867em; // 13px
+    margin-right: 15px;
+    white-space: nowrap;
+
+    p {
+        margin-bottom: 0;
+    }
+}
+
 .track-heading {
     font-size: 0.933em; // 14px
 }

diff --git a/app/partials/footer.html b/app/partials/footer.html
@@ -7,17 +7,17 @@
 
 <div ng-controller="PlayerCtrl">
 
-    <fm-track class="track" ng-show="track.track.uri" data-spotify-track="track.track" data-user="track.user" data-timer="trackPositionTimer"></fm-track>
+    <fm-track class="track" ng-show="track.track.uri" data-spotify-track="track.track" data-user="track.user" data-timer="trackPositionTimer" ng-class="{ 'no-controls': !isAuthenticated() }"></fm-track>
 
-    <div class="controls" ng-show="track.track.uri">
+    <div class="controls" ng-show="track.track.uri" ng-class="{ 'no-controls': !isAuthenticated() }">
 
         <div class="playing-animation"
              ng-switch="paused">
             <img ng-switch-when="false" src="img/icons/playing-animation.gif" alt="music playing animation">
             <img ng-switch-default src="img/icons/playing-stoped.png" alt="music stopped animation">
         </div>
 
-        <form name="controls" class="form-inline">
+        <form name="controls" class="form-inline" ng-if="isAuthenticated()">
 
             <button ng-show="paused"
                     ng-click="resume()"

diff --git a/app/partials/stats.html b/app/partials/stats.html
@@ -68,6 +68,7 @@ <h2>Top Tracks</h2>
                 <li class="track"
                     ng-repeat="track in stats.most_played_tracks"
                     data-spotify-track="track.track"
+                    data-play-count="track.total"
                     fm-track>
                 </li>
             </ul>

diff --git a/app/partials/track.html b/app/partials/track.html
@@ -30,6 +30,12 @@
     </div>
 </div>
 
+<div ng-if="playCount" class="track-right track-plays text-right">
+    <p>
+        {{ playCount }} plays
+    </p>
+</div>
+
 <div class="track-menu" dropdown is-open="status.isopen">
     <a role="button" href class="text-muted btn-context" dropdown-toggle>
         <span class="sr-only sr-only-focusable">Track menu</span>

diff --git a/tests/e2e/specs/scenarios.js b/tests/e2e/specs/scenarios.js
@@ -2,6 +2,11 @@
 
 /* https://github.com/angular/protractor/blob/master/docs/getting-started.md */
 
+var login = function login (){
+    browser.executeScript("localStorage.setItem('sn_fm_access_token', 'Ijc4NWJjMDY0LTBlMDgtNGVhMy05OGQ1LTQ0NmU0OTdiZDIxMyI.CJeLpg.oPLDqjS2W-iaAKnfJ8DBwAvLx-s');");
+    browser.driver.sleep(2000);
+};
+
 describe("FM", function() {
 
     var scrollTo = function scrollTo (y) {
@@ -100,17 +105,21 @@ describe("FM", function() {
 
         it("should pause and resume", function() {
 
+            // login
+            login();
+
             // pause
             element(by.css(".controls button:nth-child(2)")).click();
 
             var startTime = 0;
             element(by.css("footer fm-track .progress-bar")).getAttribute("aria-valuenow").then(function(value){
-                startTime = value;
+                startTime = parseInt(value);
             });
 
             browser.driver.sleep(2000);
 
             element(by.css("footer fm-track .progress-bar")).getAttribute("aria-valuenow").then(function(value){
+                value = parseInt(value);
                 expect(value).toEqual(startTime);
             });
 
@@ -119,6 +128,7 @@ describe("FM", function() {
             browser.driver.sleep(2000);
 
             element(by.css("footer fm-track .progress-bar")).getAttribute("aria-valuenow").then(function(value){
+                value = parseInt(value);
                 expect(value > startTime).toBeTruthy();
             });
         });