Merge branch 'master' into master

Author: danielstern

README.md

@@ -22,10 +22,13 @@ Total awesomeness for playing sounds. Project page here:
 ##[Angular Audio Documentation](http://danielstern.github.io/ngAudio/#/docs)
 
 
-Release Notes v1.7.3
+Release Notes v1.7.4
 
 - Updated Angular dependency to support 1.6.x
 
+Release Notes v1.7.3
+
+- Add toFinish callback
 
 Release Notes v1.7.2
 

app/angular.audio.js

@@ -1,5 +1,13 @@
 'use strict';
 angular.module('ngAudio', [])
+  .constant('ngAudioDomUid', (function () {
+    var domUid = '';
+    for (var i=0; i<8; i++)
+    {
+      domUid = domUid + Math.floor((1 + Math.random()) * 0x10000).toString(16).substring(1);
+    }
+    return domUid;//unique id persisting through module life
+  })())
 .directive('ngAudio', ['$compile', '$q', 'ngAudio', function($compile, $q, ngAudio) {
     return {
         restrict: 'AEC',
@@ -100,24 +108,33 @@ angular.module('ngAudio', [])
     };
 }])
 
-.service('remoteAudioFindingService', ['$q', function($q) {
+.service('remoteAudioFindingService', ['$q', 'ngAudioDomUid', function($q, ngAudioDomUid) {
 
     this.find = function(url) {
         var deferred = $q.defer();
-        var audio = new Audio();
-
-        audio.addEventListener('error', function() {
-            deferred.reject();
-        });
-
-        audio.addEventListener('loadstart', function() {
-            deferred.resolve(audio);
-        });
+        var $sound = document.getElementById(ngAudioDomUid);
+        if (!$sound)
+        {
+          var audioTag = document.createElement('audio');
+          audioTag.style.display = 'none';
+          audioTag.id = ngAudioDomUid;
+          audioTag.src = url;
+          document.body.appendChild(audioTag);
+          $sound = document.getElementById(ngAudioDomUid);
+          $sound.load();
+        }
+        else
+        {
+          $sound.pause();
+          $sound.src = url;
+          $sound.load();
+        }
 
-        // bugfix for chrome...
-        setTimeout(function() {
-            audio.src = url;
-        }, 1);
+        if ($sound) {
+          deferred.resolve($sound);
+        } else {
+          deferred.reject(id);
+        }
 
         return deferred.promise;
 
@@ -151,8 +168,10 @@ angular.module('ngAudio', [])
     return function(id, scope) {
 
         function twiddle(){
-            audio.play();
-            audio.pause();
+            try{
+              audio.play();
+              audio.pause();
+            }catch(e){}
             window.removeEventListener("click",twiddle);
         }
 
@@ -188,7 +207,12 @@ angular.module('ngAudio', [])
         var completeListeners = [];
         this.complete = function(callback){
             completeListeners.push(callback);
-        }
+        };
+
+        var toFinishListeners = [];
+        this.toFinish = function(secs, callback){
+            toFinishListeners.push({'secs': secs, 'callback': callback});
+        };
 
         this.pause = function() {
             $willPause = true;
@@ -248,6 +272,10 @@ angular.module('ngAudio', [])
             }
         }
 
+        this.destroyed = function() {
+          return $destroyed;
+        };
+
         function $setWatch() {
             if ($destroyed) {
                 return;
@@ -298,6 +326,10 @@ angular.module('ngAudio', [])
             }, true);
         }
 
+        function audioLoadError() {
+            audioObject.error = true;
+        }
+
         cleverAudioFindingService.find(id)
             .then(function(nativeAudio) {
                 audio = nativeAudio;
@@ -311,14 +343,13 @@ angular.module('ngAudio', [])
 
                 }
 
+                audio.addEventListener('error', audioLoadError);
+
                 audio.addEventListener('canplay', function() {
                     audioObject.canPlay = true;
                 });
 
-            }, function(error) {
-                audioObject.error = true;
-                console.warn(error);
-            });
+            }, audioLoadError);
 
 
         var interval = $interval(checkWatchers, ngAudioGlobals.performance);
@@ -327,7 +358,7 @@ angular.module('ngAudio', [])
         },function(){
             $interval.cancel(interval);
             interval = $interval(checkWatchers, ngAudioGlobals.performance);
-        })
+        });
 
         function checkWatchers() {
             if ($audioWatch) {
@@ -347,7 +378,8 @@ angular.module('ngAudio', [])
                 }
 
                 if ($willRestart) {
-                    audio.src = 'about:blank';
+                    audio.pause();
+                    audio.currentTime = 0;
                     $willRestart = false;
                 }
 
@@ -375,7 +407,7 @@ angular.module('ngAudio', [])
                     audioObject.src = audio.src;
 
 					//After we check if progress is bigger than 0, and we set
-                    var tempProgress = (audio.currentTime / audio.duration);
+                    var tempProgress = (audio.currentTime / audio.duration).toPrecision();
                     if(tempProgress  > 0 ){
                       audioObject.progress = tempProgress;
                     }
@@ -386,6 +418,13 @@ angular.module('ngAudio', [])
                         })
                     }
 
+                    toFinishListeners.forEach(function(listener) {
+                        if ((audioObject.duration - audioObject.currentTime) <= listener.secs) {
+                            listener.callback(audioObject);
+                            toFinishListeners.shift();
+                        }
+                    });
+
                     if ($looping && audioObject.currentTime >= audioObject.duration) {
                         if ($looping !== true) {
                             $looping--;

app/partial/audioEditView.html

@@ -16,6 +16,7 @@ <h3>
             <button class='btn btn-primary' ng-click='audio.paused ? audio.play() : audio.pause()'>{{audio.paused ? "Play" : "Pause" }}</button>
             <button class='btn btn-danger' ng-click='audio.restart()'>Stop</button>
             <button class='btn btn-neutral' ng-click='audio.muting = !audio.muting'>{{audio.muting ? "Unmute" : "Mute" }}</button>
+            <button class='btn btn-neutral' ng-click='audio.destroy()'>{{audio.destroyed() ? "Destroyed" : "Destroy" }}</button>
             <!-- <div class='checkbox pull-right'>
                 <label>
                     <input type=checkbox ng-model=audio.loop ng-click='audio.loop = !audio.loop'>Loop
@@ -27,13 +28,13 @@ <h3>
             <div class="form-group col-xs-3">
               <label>Loop
                 <select  class='form-control input-small select' ng-model=audio.loop ng-options="value for value in [true,0,1,2,3,4,5]"></select>
-              </label> 
+              </label>
             </div>
 
             <!-- <label> -->
                 <!-- Loop -->
             <!-- </label> -->
-           
+
 
     </form>
 </div>

app/partial/ngAudioDocs.html

@@ -94,8 +94,8 @@ <h4>NgAudioObject Reference</h4>
         <tr>
             <td>unbind()</td>
             <td><p>
-                
-            Removes all the listeners from the audio object, improving performance, but disabling most read functionality. 
+
+            Removes all the listeners from the audio object, improving performance, but disabling most read functionality.
             </p>
             <p>
                 For example, setting progress and currentTime will still work, but reading them will not return the correct value.
@@ -190,6 +190,14 @@ <h4>NgAudioObject Reference</h4>
                 </p>
             </td>
         </tr>
+        <tr>
+          <td>destroyed:boolean (read only)</td>
+          <td>
+            <p>
+              Is true if the NgAudioObject has been destroyed.
+            </p>
+          </td>
+        </tr>
     </table>
 </article>
 <article>
@@ -283,7 +291,7 @@ <h5>Example Usage</h5>
     <code>
         <pre ng-non-bindable>
 &lt;div&gt;Current Time: &#123;&#123;audio.currentTime | trackTime&#125;&#125;&lt;/div&gt;    </pre></code>
-    
+
     <h5>Example Table</h5>
     <table class="table table-striped table-bordered table-condensed">
         <thead>

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-audio",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Total awesomeness for playing sounds in AngularJS",
   "license": "MIT",
   "main": "app/angular.audio.js",

package.json

@@ -19,11 +19,9 @@
     "ngaudio",
     "angular-audio"
   ],
-  "dependencies": {
-    "browser-sync": "^2.7.12",
-    "gulp": "^3.9.0"
-  },
   "devDependencies": {
+    "browser-sync": "^2.14.0",
+    "gulp": "^3.9.1",
     "gulp-gh-pages": "^0.5.2"
   },
   "engines": {