Merge branch 'develop'

Author: davej

angular-classy.coffee

@@ -79,8 +79,10 @@ classFns =
     $scope = parent[parent.constructor::__options._scopeName]
     for key, fn of parent.constructor::
       continue unless angular.isFunction(fn)
-      continue if key in ['constructor', 'init', 'watch'] or key[0] is '_'
-      $scope[key] = angular.bind(parent, fn)
+      continue if key in ['constructor', 'init', 'watch']
+      parent[key] = angular.bind(parent, fn)
+      if key[0] isnt '_'
+        $scope[key] = parent[key]
 
   bindDependencies: (parent, args) ->
     injectObject = parent.__classyControllerInjectObject
@@ -184,4 +186,4 @@ classFns =
     if angular.isArray(deps) then @inject(parent, deps)
 
     # If `deps` is object: Wrap object in array and then inject
-    else if angular.isObject(deps) then @inject(parent, [deps])
+    else if angular.isObject(deps) then @inject(parent, [deps])

angular-classy.js

@@ -100,10 +100,15 @@ License: MIT
         if (!angular.isFunction(fn)) {
           continue;
         }
-        if ((key === 'constructor' || key === 'init' || key === 'watch') || key[0] === '_') {
+        if (key === 'constructor' || key === 'init' || key === 'watch') {
           continue;
         }
-        _results.push($scope[key] = angular.bind(parent, fn));
+        parent[key] = angular.bind(parent, fn);
+        if (key[0] !== '_') {
+          _results.push($scope[key] = parent[key]);
+        } else {
+          _results.push(void 0);
+        }
       }
       return _results;
     },