refactor(scope): separate controller from scope

Controller is standalone object, created using "new" operator, not messed up with scope anymore.
Instead, related scope is injected as $scope.

See design proposal: https://docs.google.com/document/pub?id=1SsgVj17ec6tnZEX3ugsvg0rVVR11wTso5Md-RdEmC0k

Closes #321
Closes #425

Breaks controller methods are not exported to scope automatically
Breaks Scope#$new() does not take controller as argument anymore

1 files changed, 9 insertions, 13 deletions

diff --git a/test/service/formFactorySpec.js b/test/service/formFactorySpec.js
index fbe601c6..1a23aa49 100644
--- a/test/service/formFactorySpec.js
+++ b/test/service/formFactorySpec.js
@@ -13,23 +13,24 @@ describe('$formFactory', function() {
     var scope;
     var log;
 
-    function WidgetCtrl($formFactory){
-      this.$formFactory = $formFactory;
+    function WidgetCtrl($formFactory, $scope) {
       log += '<init>';
-      this.$render = function() {
+      $scope.$render = function() {
         log += '$render();';
       };
-      this.$on('$validate', function(e){
+      $scope.$on('$validate', function(e){
         log += '$validate();';
       });
+
+      this.$formFactory = $formFactory;
     }
 
-    WidgetCtrl.$inject = ['$formFactory'];
+    WidgetCtrl.$inject = ['$formFactory', '$scope'];
 
     WidgetCtrl.prototype = {
-        getFormFactory: function() {
-          return this.$formFactory;
-        }
+      getFormFactory: function() {
+        return this.$formFactory;
+      }
     };
 
     beforeEach(inject(function($rootScope, $formFactory) {
@@ -70,11 +71,6 @@ describe('$formFactory', function() {
           expect(widget.$modelValue).toEqual('xyz');
 
         }));
-
-
-        it('should have controller prototype methods', inject(function($rootScope, $formFactory) {
-          expect(widget.getFormFactory()).toEqual($formFactory);
-        }));
       });