Fixed click/a bug & hide a until ready

QutEcoacoustics · Sep 9, 2014 · 68999bf · 68999bf
1 parent da4fc7b
commit 68999bf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/app/recordings/recentRecordings/_recentRecordings.scss b/src/app/recordings/recentRecordings/_recentRecordings.scss
@@ -2,4 +2,8 @@
   tr:hover {
     cursor: pointer;
   }
+
+  .hide * {
+    visibility: collapse;
+  }
 }
diff --git a/src/app/recordings/recentRecordings/recentRecordings.js b/src/app/recordings/recentRecordings/recentRecordings.js
@@ -48,7 +48,11 @@ angular.module("bawApp.recordings.recentRecordings", [])
                     console.error(reason);
                 });
 
-            $scope.navigate = function navigate(link) {
+            $scope.navigate = function navigate($event, link) {
+                if ($event.target.nodeName.toLowerCase() == "a") {
+                    return;
+                }
+
                 $location.url(link);
             };
         }

diff --git a/src/app/recordings/recentRecordings/recentRecordings.tpl.html b/src/app/recordings/recentRecordings/recentRecordings.tpl.html
@@ -15,11 +15,11 @@ <h1>Recent Audio Recordings</h1>
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="r in recentRecordings" ng-click="navigate(r.listenLink)">
+                    <tr ng-repeat="r in recentRecordings" ng-click="navigate($event, r.listenLink)">
                         <td>{{r.site.name || r.siteId}}</td>
                         <td>{{r.durationHumanized}}</td>
                         <td>{{r.uploadedHumanized}}</td>
-                        <td>
+                        <td ng-class="{hide:!r}">
                             <a ng-href="{{r.listenLink}}" class="btn btn-primary btn-small">
                                 <span class="glyphicon glyphicon-play"></span> Play
                             </a>