chore(Scope): remove deregisterNotifier feature for $watch

We no longer have a need for this feature that was added to primarily support
$watchGroup (see previous commit).

BREAKING CHANGE: deregisterNotifier callback for $watch is no longer available

This api was available only in the last few 1.3 beta versions and is not
very useful for applications, so we don't expect that anyone will be affected
by this change.

Author: IgorMinar

src/ng/interpolate.js

@@ -301,15 +301,15 @@ function $InterpolateProvider() {
           exp: text, //just for compatibility with regular watchers created via $watch
           separators: separators,
           expressions: expressions,
-          $$watchDelegate: function (scope, listener, objectEquality, deregisterNotifier) {
+          $$watchDelegate: function (scope, listener, objectEquality) {
             var lastValue;
             return scope.$watchGroup(parseFns, function interpolateFnWatcher(values, oldValues) {
               var currValue = compute(values);
               if (isFunction(listener)) {
                 listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope);
               }
               lastValue = currValue;
-            }, objectEquality, deregisterNotifier);
+            }, objectEquality);
           }
         });
       }

src/ng/parse.js

@@ -1031,7 +1031,7 @@ function $ParseProvider() {
       }
     };
 
-    function oneTimeWatch(scope, listener, objectEquality, deregisterNotifier, parsedExpression) {
+    function oneTimeWatch(scope, listener, objectEquality, parsedExpression) {
       var unwatch, lastValue;
       return unwatch = scope.$watch(function oneTimeWatch(scope) {
         return parsedExpression(scope);
@@ -1047,10 +1047,10 @@ function $ParseProvider() {
             }
           });
         }
-      }, objectEquality, deregisterNotifier);
+      }, objectEquality);
     }
 
-    function constantWatch(scope, listener, objectEquality, deregisterNotifier, parsedExpression) {
+    function constantWatch(scope, listener, objectEquality, parsedExpression) {
       var unwatch;
       return unwatch = scope.$watch(function constantWatch(scope) {
         return parsedExpression(scope);
@@ -1059,7 +1059,7 @@ function $ParseProvider() {
           listener.apply(this, arguments);
         }
         unwatch();
-      }, objectEquality, deregisterNotifier);
+      }, objectEquality);
     }
 
     function addInterceptor(parsedExpression, interceptorFn) {

src/ng/rootScope.js

@@ -322,15 +322,13 @@ function $RootScopeProvider(){
        *    - `scope` refers to the current scope
        * @param {boolean=} objectEquality Compare for object equality using {@link angular.equals} instead of
        *     comparing for reference equality.
-       * @param {function()=} deregisterNotifier Function to call when the deregistration function
-       *     get called.
        * @returns {function()} Returns a deregistration function for this listener.
        */
-      $watch: function(watchExp, listener, objectEquality, deregisterNotifier) {
+      $watch: function(watchExp, listener, objectEquality) {
         var get = compileToFn(watchExp, 'watch');
 
         if (get.$$watchDelegate) {
-          return get.$$watchDelegate(this, listener, objectEquality, deregisterNotifier, get);
+          return get.$$watchDelegate(this, listener, objectEquality, get);
         }
         var scope = this,
             array = scope.$$watchers,
@@ -358,9 +356,6 @@ function $RootScopeProvider(){
         return function deregisterWatch() {
           arrayRemove(array, watcher);
           lastDirtyWatch = null;
-          if (isFunction(deregisterNotifier)) {
-            deregisterNotifier();
-          }
         };
       },
 

test/ng/rootScopeSpec.js

@@ -526,34 +526,6 @@ describe('Scope', function() {
         expect(log).toEqual(['watch1', 'watchAction1', 'watch2', 'watchAction2', 'watch3', 'watchAction3',
                              'watch2', 'watch3']);
       }));
-
-      describe('deregisterNotifier', function () {
-        it('should call the deregisterNotifier when the watch is deregistered', inject(
-          function($rootScope) {
-            var notifier = jasmine.createSpy('deregisterNotifier');
-            var listenerRemove = $rootScope.$watch('noop', noop, false, notifier);
-
-            expect(notifier).not.toHaveBeenCalled();
-
-            listenerRemove();
-            expect(notifier).toHaveBeenCalledOnce();
-          }));
-
-
-        it('should call the deregisterNotifier when a one-time expression is stable', inject(
-          function($rootScope) {
-            var notifier = jasmine.createSpy('deregisterNotifier');
-            $rootScope.$watch('::foo', noop, false, notifier);
-
-            expect(notifier).not.toHaveBeenCalledOnce();
-            $rootScope.$digest();
-            expect(notifier).not.toHaveBeenCalledOnce();
-
-            $rootScope.foo = 'foo';
-            $rootScope.$digest();
-            expect(notifier).toHaveBeenCalledOnce();
-          }));
-      });
     });