dart-archive · vicb · Apr 24, 2014 · Apr 24, 2014 · Apr 24, 2014 · Apr 24, 2014
diff --git a/benchmark/lexer_perf.dart b/benchmark/lexer_perf.dart
@@ -5,16 +5,10 @@ import 'package:angular/core/parser/lexer.dart';
 
 main() {
   Lexer lexer = new Lexer();
-  time('ident', () =>
-      lexer.call('ctrl foo baz ctrl.foo ctrl.bar ctrl.baz'));
-  time('ident-path', () =>
-      lexer.call('a.b a.b.c a.b.c.d a.b.c.d.e.f'));
-  time('num', () =>
-      lexer.call('1 23 34 456 12341234 12351235'));
-  time('num-double', () =>
-      lexer.call('.0 .1 .12 0.123 0.1234'));
-  time('string', () =>
-      lexer.call("'quick brown dog and fox say what'"));
-  time('string-escapes', () =>
-      lexer.call("quick '\\' brown \u1234 dog and fox\n\rsay what'"));
+  time('ident', () => lexer.call('ctrl foo baz ctrl.foo ctrl.bar ctrl.baz'));
+  time('ident-path', () => lexer.call('a.b a.b.c a.b.c.d a.b.c.d.e.f'));
+  time('num', () => lexer.call('1 23 34 456 12341234 12351235'));
+  time('num-double', () => lexer.call('.0 .1 .12 0.123 0.1234'));
+  time('string', () => lexer.call("'quick brown dog and fox say what'"));
+  time('string-escapes', () => lexer.call("quick '\\' brown \u1234 dog and fox\n\rsay what'"));
 }
diff --git a/example/web/animation.dart b/example/web/animation.dart
@@ -9,9 +9,6 @@ part 'animation/visibility_demo.dart';
 part 'animation/stress_demo.dart';
 part 'animation/css_demo.dart';
 
-@Controller(
-    selector: '[animation-demo]',
-    publishAs: 'demo')
 class AnimationDemo {
   final pages = ["About", "ng-repeat", "Visibility", "Css", "Stress Test"];
   var currentPage = "About";
@@ -24,11 +21,11 @@ class AnimationDemoModule extends Module {
     bind(VisibilityDemo);
     bind(StressDemo);
     bind(CssDemo);
-    bind(AnimationDemo);
   }
 }
 main() {
   applicationFactory()
       .addModule(new AnimationDemoModule())
+      .rootContextType(AnimationDemo)
       .run();
 }
diff --git a/example/web/animation.html b/example/web/animation.html
@@ -6,14 +6,15 @@
 </head>
 <body class="ng-cloak" ng-app animation-demo>
   <nav>
-    <button ng-repeat="page in demo.pages"
-        ng-click="demo.currentPage = page"
-        ng-class="{'current': demo.currentPage == page}">
+    <button ng-repeat="page in pages"
+        ng-click="currentPage = page"
+        ng-class="{'current': currentPage == page}">
       {{page}}
     </button>
   </nav>
-  <div class="content" ng-switch="demo.currentPage">
+  <div class="content" ng-switch="currentPage">
     <div class="demo" ng-switch-default>
+
       <h2>About</h2>
       <p>The NgAnimate module is a port with modifications of the original
         AngularJS animation module. The default implementation does nothing.
@@ -22,6 +23,7 @@ <h2>About</h2>
         added it allows you define and run css animations on your elements with
         pure CSS.</p>
       <p>Check out the demos above.</p>
+
     </div>
     <div class="demo" ng-switch-when="ng-repeat">
       <h2>ng-repeat Demo</h2>

diff --git a/example/web/animation/css_demo.dart b/example/web/animation/css_demo.dart
@@ -4,25 +4,24 @@ part of animation;
     selector: 'css-demo',
     template: '''
       <div class="css-demo">
-        <button ng-click="ctrl.stateA = !ctrl.stateA"
-            ng-class="{'active': ctrl.stateA}">
+        <button ng-click="stateA = !stateA"
+            ng-class="{'active': stateA}">
             Toggle A</button>
-        <button ng-click="ctrl.stateB = !ctrl.stateB"
-            ng-class="{'active': ctrl.stateB}">
+        <button ng-click="stateB = !stateB"
+            ng-class="{'active': stateB}">
             Toggle B</button>
-        <button ng-click="ctrl.stateC = !ctrl.stateC"
-            ng-class="{'active': ctrl.stateC}">
+        <button ng-click="stateC = !stateC"
+            ng-class="{'active': stateC}">
             Toggle C</button>
         <div class="box-container">
           <div class="css-box" ng-class="{
-            'a': ctrl.stateA,
-            'b': ctrl.stateB,
-            'c': ctrl.stateC}">BOX</div>
+            'a': stateA,
+            'b': stateB,
+            'c': stateC}">BOX</div>
           </div>
         </div>
       </div>
     ''',
-    publishAs: 'ctrl',
     applyAuthorStyles: true)
 class CssDemo {
   bool stateA = false;

diff --git a/example/web/animation/repeat_demo.dart b/example/web/animation/repeat_demo.dart
@@ -4,19 +4,17 @@ part of animation;
     selector: 'repeat-demo',
     template: '''
       <div class="repeat-demo">
-      <button ng-click="ctrl.addItem()">Add Thing</button>
-      <button ng-click="ctrl.removeItem()">Remove Thing
-      </button>
+      <button ng-click="addItem()">Add Thing</button>
+      <button ng-click="removeItem()">Remove Thing</button>
       <ul>
-        <li ng-repeat="outer in ctrl.items">
+        <li ng-repeat="outer in items">
           <ul>
-            <li ng-repeat="inner in ctrl.items">{{inner}}</li>
+            <li ng-repeat="inner in items">{{inner}}</li>
           </ul>
         </li>
       </ul>
       </div>
     ''',
-    publishAs: 'ctrl',
     applyAuthorStyles: true)
 class RepeatDemo {
   var thing = 0;

diff --git a/example/web/animation/stress_demo.dart b/example/web/animation/stress_demo.dart
@@ -4,14 +4,13 @@ part of animation;
     selector: 'stress-demo',
     template: '''
       <div class="stress-demo">
-        <button ng-click="ctrl.visible = !ctrl.visible">
+        <button ng-click="visible = !visible">
           Toggle Visibility</button>
         <div>
-          <div class="stress-box" ng-repeat="number in ctrl.numbers"></div>
+          <div class="stress-box" ng-repeat="number in numbers"></div>
         </div>
       </div>
     ''',
-    publishAs: 'ctrl',
     applyAuthorStyles: true)
 class StressDemo {
   bool _visible = true;

diff --git a/example/web/animation/visibility_demo.dart b/example/web/animation/visibility_demo.dart
@@ -4,19 +4,18 @@ part of animation;
     selector: 'visibility-demo',
     template: '''
       <div class="visibility-demo">
-      <button ng-click="ctrl.visible = !ctrl.visible">Toggle Visibility</button>
-      <div class="visible-if" ng-if="ctrl.visible">
+      <button ng-click="visible = !visible">Toggle Visibility</button>
+      <div class="visible-if" ng-if="visible">
         <p>Hello World. ng-if will create and destroy
           dom elements each time you toggle me.</p>
       </div>
-      <div class="visible-hide" ng-hide="ctrl.visible">
+      <div class="visible-hide" ng-hide="visible">
         <p>Hello World. ng-hide will add and remove
           the .ng-hide class from me to show and
           hide this view of text.</p>
       </div>
       </div>
     ''',
-    publishAs: 'ctrl',
     applyAuthorStyles: true)
 class VisibilityDemo {
   bool visible = false;

diff --git a/example/web/bouncing_balls.dart b/example/web/bouncing_balls.dart
@@ -26,20 +26,16 @@ class BallModel {
 
 }
 
-@Controller(
-  selector: '[bounce-controller]',
-  publishAs: 'bounce')
 class BounceController {
   var lastTime = window.performance.now();
   var run = false;
   var fps = 0;
   var digestTime = 0;
   var currentDigestTime = 0;
   var balls = [];
-  final Scope scope;
   var ballClassName = 'ball';
 
-  BounceController(this.scope) {
+  BounceController() {
     changeCount(100);
     if (run) tick();
   }
@@ -72,17 +68,18 @@ class BounceController {
   void timeDigest() {
     var start = window.performance.now();
     digestTime = currentDigestTime;
-    scope.rootScope.domRead(() {
-      currentDigestTime = window.performance.now() - start;
-    });
+// todo(vicb)
+//    scope.rootScope.domRead(() {
+//      currentDigestTime = window.performance.now() - start;
+//    });
   }
 
   void tick() {
     var now = window.performance.now();
     var delay = now - lastTime;
 
     fps = (1000/delay).round();
-    for(var i=0, ii=balls.length; i<ii; i++) {
+    for(var i = 0; i < balls.length; i++) {
       var b = balls[i];
       b.x += delay * b.velX;
       b.y += delay * b.velY;
@@ -124,11 +121,13 @@ class BallPosition {
 
 class MyModule extends Module {
   MyModule() {
-    bind(BounceController);
     bind(BallPosition);
   }
 }
 
 main() {
-  applicationFactory().addModule(new MyModule()).run();
+  applicationFactory()
+      .rootContextType(BounceController)
+      .addModule(new MyModule())
+      .run();
 }
diff --git a/example/web/bouncing_balls.html b/example/web/bouncing_balls.html
@@ -39,30 +39,30 @@
 <body ng-app>
   <div bounce-controller>
     <div class="balls">
-        <div ng-repeat="ball in bounce.balls"
-             class="{{bounce.ballClassName}}"
+        <div ng-repeat="ball in balls"
+             class="{{ ballClassName }}"
              ball-position="ball"></div>
     </div>
 
     <div>
         <div class="fps-bar">
-            <div class="fps" ng-style-width="bounce.fps*4 + 'px'"></div>
+            <div class="fps" ng-style-width="fps * 4 + 'px'"></div>
         </div>
     </div>
 
-    {{bounce.fps}} fps. ({{bounce.balls.length}} balls) [{{1000/bounce.fps}} ms] <br>
-    Digest: {{bounce.digestTime}} ms<br>
-    <a href ng-click="bounce.changeCount(1)">+1</a>
-    <a href ng-click="bounce.changeCount(10)">+10</a>
-    <a href ng-click="bounce.changeCount(100)">+100</a>
+    {{ fps }} fps. ({{ balls.length }} balls) [{{ 1000 / fps }} ms] <br>
+    Digest: {{ digestTime }} ms<br>
+    <a href ng-click="changeCount(1)">+1</a>
+    <a href ng-click="changeCount(10)">+10</a>
+    <a href ng-click="changeCount(100)">+100</a>
     <br>
-    <a href ng-click="bounce.changeCount(-1)">-1</a>
-    <a href ng-click="bounce.changeCount(-10)">-10</a>
-    <a href ng-click="bounce.changeCount(-100)">-100</a>
+    <a href ng-click="changeCount(-1)">-1</a>
+    <a href ng-click="changeCount(-10)">-10</a>
+    <a href ng-click="changeCount(-100)">-100</a>
     <br>
-    <a href ng-click="bounce.playPause()">&#x25B6;&#10073;&#10073;</a> <br>
-    <a href ng-click="bounce.toggleCSS()">Toggle CSS</a><br>
-    <a href ng-click="bounce.timeDigest()">noop</a><br>
+    <a href ng-click="playPause()">&#x25B6;&#10073;&#10073;</a> <br>
+    <a href ng-click="toggleCSS()">Toggle CSS</a><br>
+    <a href ng-click="timeDigest()">noop</a><br>
   </div>
 
   <script type="application/dart" src="bouncing_balls.dart"></script>

diff --git a/example/web/hello_world.dart b/example/web/hello_world.dart
@@ -1,15 +1,12 @@
 import 'package:angular/angular.dart';
 import 'package:angular/application_factory.dart';
 
-@Controller(
-    selector: '[hello-world-controller]',
-    publishAs: 'ctrl')
 class HelloWorld {
   String name = "world";
 }
 
 main() {
   applicationFactory()
-      .addModule(new Module()..bind(HelloWorld))
+      .rootContextType(HelloWorld)
       .run();
 }
diff --git a/example/web/hello_world.html b/example/web/hello_world.html
@@ -5,8 +5,8 @@
 </head>
 <body hello-world-controller>
 
-<h3>Hello {{ctrl.name}}!</h3>
-name: <input type="text" ng-model="ctrl.name">
+<h3>Hello {{ name }}!</h3>
+name: <input type="text" ng-model="name">
 
 <script type="application/dart" src="hello_world.dart"></script>
 <script src="packages/browser/dart.js"></script>

diff --git a/example/web/todo.dart b/example/web/todo.dart
@@ -53,10 +53,6 @@ class HttpServer implements Server {
   }
 }
 
-
-@Controller(
-    selector: '[todo-controller]',
-    publishAs: 'todo')
 class Todo {
   var items = <Item>[];
   Item newItem;
@@ -94,18 +90,12 @@ class Todo {
 
 main() {
   print(window.location.search);
-  var module = new Module()
-      ..bind(Todo)
-      ..bind(PlaybackHttpBackendConfig);
+  var module = new Module()..bind(PlaybackHttpBackendConfig);
 
   // If these is a query in the URL, use the server-backed
   // TodoController.  Otherwise, use the stored-data controller.
   var query = window.location.search;
-  if (query.contains('?')) {
-    module.bind(Server, toImplementation: HttpServer);
-  } else {
-    module.bind(Server, toImplementation: NoOpServer);
-  }
+  module.bind(Server, toImplementation: query.contains('?') ? HttpServer : NoOpServer);
 
   if (query == '?record') {
     print('Using recording HttpBackend');
@@ -119,5 +109,8 @@ main() {
     module.bind(HttpBackend, toImplementation: PlaybackHttpBackend);
   }
 
-  applicationFactory().addModule(module).run();
+  applicationFactory()
+      .addModule(module)
+      .rootContextType(Todo)
+      .run();
 }
diff --git a/example/web/todo.html b/example/web/todo.html
@@ -11,29 +11,29 @@
 
     <div ng-hide="true" class="border well loading">Wait, Dart is loading this awesome app...</div>
 
-    <div todo-controller class="border well" ng-cloak>
+    <div class="border well" ng-cloak>
         <h2>Things To Do ;-)</h2>
 
         <div class="right">
-            <button ng-click="todo.markAllDone()" class="btn btn-small">mark all done</button>
-            <button ng-click="todo.archiveDone()" class="btn btn-small">archive done</button>
+            <button ng-click="markAllDone()" class="btn btn-small">mark all done</button>
+            <button ng-click="archiveDone()" class="btn btn-small">archive done</button>
         </div>
 
-        <p>Remaining <b>{{todo.remaining()}}</b> of <b>{{todo.items.length}}</b> items.</p>
+        <p>Remaining <b>{{ remaining() }}</b> of <b>{{ items.length }}</b> items.</p>
 
 
         <ul class="well unstyled">
-            <li ng-repeat="item in todo.items" ng-class="todo.classFor(item)">
+            <li ng-repeat="item in items" ng-class="classFor(item)">
                 <label class="checkbox">
                     <input type="checkbox" ng-model="item.done"> {{item.text}}
                 </label>
             </li>
         </ul>
 
         <form class="form-inline" onsubmit="return false;">
-            <input type="text" ng-model="todo.newItem.text">
-            <button ng-click="todo.add()" ng-disabled="todo.newItem.isEmpty" class="btn btn-primary">add</button>
-            <button ng-click="todo.newItem.clear()" ng-disabled="todo.newItem.isEmpty" class="btn">clear</button>
+            <input type="text" ng-model="newItem.text">
+            <button ng-click="add()" ng-disabled="newItem.isEmpty" class="btn btn-primary">add</button>
+            <button ng-click="newItem.clear()" ng-disabled="newItem.isEmpty" class="btn">clear</button>
         </form>
     </div>
 </body>