fix: Apply mixins to rootScope

DAB0mB · DAB0mB · commit 1a1c61b1ad8e · 2016-02-21T21:13:40.000+02:00
diff --git a/dist/angular-meteor.js b/dist/angular-meteor.js
@@ -1595,7 +1595,7 @@
 	angular.module(name, [])
 
 	/*
-	  A service which lets us apply mixins into the `ChildScope` prototype.
+	  A service which lets us apply mixins into Scope.prototype.
 	  The flow is simple. Once we define a mixin, it will be stored in the `$Mixer`,
 	  and any time a `ChildScope` prototype is created
 	  it will be extended by the `$Mixer`.
@@ -1608,6 +1608,9 @@
 	  var _this = this;
 
 	  this._mixins = [];
+	  // Apply mixins automatically on specified contexts
+	  this._autoExtend = [];
+	  this._autoConstruct = [];
 
 	  // Adds a new mixin
 	  this.mixin = function (mixin) {
@@ -1616,6 +1619,13 @@
 	    }
 
 	    _this._mixins = _.union(_this._mixins, [mixin]);
+	    // Apply mixins to stored contexts
+	    _this._autoExtend.forEach(function (context) {
+	      return _this._extend(context);
+	    });
+	    _this._autoConstruct.forEach(function (context) {
+	      return _this._construct(context);
+	    });
 	    return _this;
 	  };
 
@@ -1665,24 +1675,15 @@
 	  var Scope = $rootScope.constructor;
 	  var $new = $rootScope.$new;
 
-	  // Extends and constructs every newly created scope without affecting the root scope
-	  Scope.prototype.$new = function (isolate, parent) {
-	    var firstChild = this === $rootScope && !this.$$ChildScope;
-	    var scope = $new.call(this, isolate, parent);
-
-	    // If the scope is isolated we would like to extend it aswell
-	    if (isolate) {
-	      // The scope is the prototype of its upcomming child scopes, so the methods would
-	      // be accessable to them as well
-	      $Mixer._extend(scope);
-	    }
-	    // Else, if this is the first child of the root scope we would like to apply the extensions
-	    // without affection the root scope
-	    else if (firstChild) {
-	        // Creating a middle layer where all the extensions are gonna be applied to
-	        scope.__proto__ = this.$$ChildScope.prototype = $Mixer._extend(Object.create(this));
-	      }
+	  // Apply extensions whether a mixin in defined.
+	  // Note that this way mixins which are initialized later
+	  // can be applied on rootScope.
+	  $Mixer._autoExtend.push(Scope.prototype);
+	  $Mixer._autoConstruct.push($rootScope);
 
+	  Scope.prototype.$new = function () {
+	    var scope = $new.apply(this, arguments);
+	    // Apply constructors to newly created scopes
 	    return $Mixer._construct(scope);
 	  };
 	}]);
diff --git a/src/modules/mixer.js b/src/modules/mixer.js
@@ -4,7 +4,7 @@ export const Mixer = '$Mixer';
 angular.module(name, [])
 
 /*
-  A service which lets us apply mixins into the `ChildScope` prototype.
+  A service which lets us apply mixins into Scope.prototype.
   The flow is simple. Once we define a mixin, it will be stored in the `$Mixer`,
   and any time a `ChildScope` prototype is created
   it will be extended by the `$Mixer`.
@@ -15,6 +15,9 @@ angular.module(name, [])
  */
 .service(Mixer, function() {
   this._mixins = [];
+  // Apply mixins automatically on specified contexts
+  this._autoExtend = [];
+  this._autoConstruct = [];
 
   // Adds a new mixin
   this.mixin = (mixin) => {
@@ -23,6 +26,9 @@ angular.module(name, [])
     }
 
     this._mixins = _.union(this._mixins, [mixin]);
+    // Apply mixins to stored contexts
+    this._autoExtend.forEach(context => this._extend(context));
+    this._autoConstruct.forEach(context => this._construct(context));
     return this;
   };
 
diff --git a/src/modules/scope.js b/src/modules/scope.js
@@ -13,25 +13,15 @@ angular.module(name, [
     const Scope = $rootScope.constructor;
     const $new = $rootScope.$new;
 
-    // Extends and constructs every newly created scope without affecting the root scope
-    Scope.prototype.$new = function(isolate, parent) {
-      const firstChild = this === $rootScope && !this.$$ChildScope;
-      const scope = $new.call(this, isolate, parent);
-
-      // If the scope is isolated we would like to extend it aswell
-      if (isolate) {
-        // The scope is the prototype of its upcomming child scopes, so the methods would
-        // be accessable to them as well
-        $Mixer._extend(scope);
-      }
-      // Else, if this is the first child of the root scope we would like to apply the extensions
-      // without affection the root scope
-      else if (firstChild) {
-        // Creating a middle layer where all the extensions are gonna be applied to
-        scope.__proto__ = this.$$ChildScope.prototype =
-          $Mixer._extend(Object.create(this));
-      }
+    // Apply extensions whether a mixin in defined.
+    // Note that this way mixins which are initialized later
+    // can be applied on rootScope.
+    $Mixer._autoExtend.push(Scope.prototype);
+    $Mixer._autoConstruct.push($rootScope);
 
+    Scope.prototype.$new = function() {
+      const scope = $new.apply(this, arguments);
+      // Apply constructors to newly created scopes
       return $Mixer._construct(scope);
     };
   }
diff --git a/tests/integration/mixer.spec.js b/tests/integration/mixer.spec.js
@@ -24,13 +24,12 @@ describe('angular-meteor.mixer', function() {
     });
 
     afterEach(function() {
-      delete $rootScope.$$ChildScope;
       $Mixer._mixout(Mixin);
     });
 
-    it('should leave root scope as is', function() {
-      expect($rootScope.prop).toBeUndefined();
-      expect($rootScope.$method).toBeUndefined();
+    it('should extend root scope', function() {
+      expect($rootScope.prop).toEqual('prop');
+      expect($rootScope.$method).toEqual(jasmine.any(Function));
     });
 
     it('should extend child scope', function() {
