(subscriptions): Close when scope destroys also in $scope.MeteorCollection/Object.subscribe functions

Make $scope.MeteorObject.subscribe() and $scope.MeteorCollection.subscribe() automatically close subscription when $scope destroys

Author: Urigo

modules/angular-meteor-meteorCollection.js

@@ -303,15 +303,24 @@ angularMeteorCollections.factory('$meteorCollection', ['AngularMeteorCollection'
     }
   }]);
 
-angularMeteorCollections.run(['$rootScope', '$q', '$meteorCollection',
-  function($rootScope, $q, $meteorCollection) {
+angularMeteorCollections.run(['$rootScope', '$q', '$meteorCollection', '$meteorSubscribe',
+  function($rootScope, $q, $meteorCollection, $meteorSubscribe) {
     Object.getPrototypeOf($rootScope).$meteorCollection = function() {
       var args = Array.prototype.slice.call(arguments);
       var collection = $meteorCollection.apply(this, args);
+      var subscription = null;
+
+      collection.subscribe = function () {
+        var args = Array.prototype.slice.call(arguments);
+        subscription = $meteorSubscribe._subscribe(this, $q.defer(), args);
+        return collection;
+      };
 
       this.$on('$destroy', function() {
         collection.stop();
-	  });
+        if (subscription)
+          subscription.stop();
+	    });
 
       return collection;
 	};

modules/angular-meteor-object.js

@@ -143,14 +143,23 @@ angularMeteorObject.factory('$meteorObject', ['$rootScope', '$meteorUtils', 'Ang
     };
   }]);
 
-angularMeteorObject.run(['$rootScope', '$q', '$meteorObject',
-  function($rootScope, $q, $meteorObject) {
+angularMeteorObject.run(['$rootScope', '$q', '$meteorObject', '$meteorSubscribe',
+  function($rootScope, $q, $meteorObject, $meteorSubscribe) {
     Object.getPrototypeOf($rootScope).$meteorObject = function() {
       var args = Array.prototype.slice.call(arguments);
       var object = $meteorObject.apply(this, args);
+      var subscription = null;
+
+      object.subscribe = function () {
+        var args = Array.prototype.slice.call(arguments);
+        subscription = $meteorSubscribe._subscribe(this, $q.defer(), args);
+        return object;
+      };
 
       this.$on('$destroy', function() {
         object.stop();
+        if (subscription)
+          subscription.stop();
 	  });
 
       return object;