Merge branch 'fix-ionAudioPlay-scope'

Author: arielfaur

bower.json

@@ -6,11 +6,11 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "angular": "1.3.x",
-    "angular-loader": "1.3.x",
-    "angular-mocks": "~1.3.x"
+    "angular": "~1.4.x",
+    "angular-loader": "~1.4.x",
+    "angular-mocks": "~1.4.x"
   },
   "devDependencies": {
-    "ionic": "driftyco/ionic-bower#1.0.1"
+    "ionic": "driftyco/ionic-bower#1.1.0"
   }
 }

dist/ion-audio.js

@@ -336,9 +336,13 @@ angular.module('ionic-audio', ['ionic'])
         return {
             //scope: true,
             restrict: 'A',
-            require: '^^ionAudioControls',
-            link: function(scope, element, attrs, controller) {
+            require: ['^^ionAudioTrack', '^^ionAudioControls'],
+            link: function(scope, element, attrs, controllers) {
                 var isLoading, currentStatus = 0;
+                
+                scope.track = controllers[0].getTrack();
+                
+                var controller = controllers[1];
 
                 var init = function() {
                     isLoading = false;

example-audio/www/js/ion-audio.js

@@ -336,9 +336,13 @@ angular.module('ionic-audio', ['ionic'])
         return {
             //scope: true,
             restrict: 'A',
-            require: '^^ionAudioControls',
-            link: function(scope, element, attrs, controller) {
+            require: ['^^ionAudioTrack', '^^ionAudioControls'],
+            link: function(scope, element, attrs, controllers) {
                 var isLoading, currentStatus = 0;
+                
+                scope.track = controllers[0].getTrack();
+                
+                var controller = controllers[1];
 
                 var init = function() {
                     isLoading = false;