Merge gruntfile

Author: jeme

README.md

@@ -24,3 +24,19 @@ To evolve the concept of an Angular "Route" into a more general concept of a "St
 * [Generated Docs](http://angular-ui.github.com/ui-router/build/doc/)
 * Latest build: [angular-ui-states.min.js](http://angular-ui.github.com/ui-router/build/angular-ui-states.min.js)
   (uncompressed [angular-ui-states.js](http://angular-ui.github.com/ui-router/build/angular-ui-states.js))
+
+# Developing
+
+Dependencies for building the solution and running tests:
+
+* [karma](http://karma-runner.github.com/) - run: `$ npm install -g karma`
+* [grunt-cli](https://github.com/gruntjs/grunt-cli) - run: `$ npm install -g grunt-cli`
+* Then install development dependencies with: `$ npm install`
+
+There is a number of targets in the gruntfile that is used to building the solution, documents etc.
+
+* `grunt`: Perform a normal build, runs jshint and karma tests
+* `grunt build`: Perform a normal build
+* `grunt dist`: Perform a clean build and generate documentation
+* `grunt dev`: Run dev server and watch for changes, builds and runs karma tests on changes.
+

src/viewDirective.js

@@ -40,12 +40,8 @@ function $ViewDirective(   $state,   $compile,   $controller,   $anchorScroll) {
           viewScope = scope.$new();
           if (locals.$$controller) {
             locals.$scope = viewScope;
-            // This is a 'directive controller'. need to allow element and attr injections (TBD: transcludeFn)
-            locals.$element = element;
-            locals.$attrs = attr;
-            //store directive controller with distinct name on the element.data as per angular.js convention
             var controller = $controller(locals.$$controller, locals);
-            element.data('$' + name+'Controller', controller);
+            element.contents().data('$ngControllerController', controller);
           }
           link(viewScope);
           viewScope.$emit('$viewContentLoaded');