Fixed play/pause bug. And bower resolutions

QutEcoacoustics · Jan 29, 2014 · 7bc18fe · 7bc18fe
1 parent 9b2aead
commit 7bc18fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {},
   "resolutions": {
-    "angular": "1.2.x"
+    "angular": ">1.2.6"
   },
   "private": true
 }
diff --git a/src/components/directives/ngAudio.js b/src/components/directives/ngAudio.js
@@ -56,7 +56,7 @@ bawds.directive('ngAudio', ['$parse', function ($parse) {
             function pause() {
                 element.pause();
             }
-            
+
             function toStart() {
                 element.currentTime = 0;
             }
@@ -72,7 +72,7 @@ bawds.directive('ngAudio', ['$parse', function ($parse) {
                 }
             }
 
-            function updateState(event) {
+            function updateState(event, isPlaying) {
                 scope.$safeApply2(function () {
                     if (attributes.ngAudio) {
                         var target = expression(scope);
@@ -89,7 +89,7 @@ bawds.directive('ngAudio', ['$parse', function ($parse) {
 
                         updateObject(element ,target);
 
-                        target.isPlaying = event && event.type === "playing";
+                        target.isPlaying = !element.paused;
 
                         target.canPlay = element.readyState >= readyStates.haveFutureData;