Merge pull request #650 from passy/angular-trimming

AngularJS Item Trimming / Angular 1.2 Upgrade

architecture-examples/angularjs/bower.json

@@ -2,10 +2,10 @@
   "name": "todomvc-angular",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "~1.0.7",
+    "angular": "~1.2.0",
     "todomvc-common": "~0.1.4"
   },
   "devDependencies": {
-    "angular-mocks": "~1.0.5"
+    "angular-mocks": "~1.2.0"
   }
 }

architecture-examples/angularjs/index.html

@@ -19,14 +19,14 @@
 				<input id="toggle-all" type="checkbox" ng-model="allChecked" ng-click="markAll(allChecked)">
 				<label for="toggle-all">Mark all as complete</label>
 				<ul id="todo-list">
-					<li ng-repeat="todo in todos | filter:statusFilter" ng-class="{completed: todo.completed, editing: todo == editedTodo}">
+					<li ng-repeat="todo in todos track by $index | filter:statusFilter" ng-class="{completed: todo.completed, editing: todo == editedTodo}">
 						<div class="view">
 							<input class="toggle" type="checkbox" ng-model="todo.completed">
 							<label ng-dblclick="editTodo(todo)">{{todo.title}}</label>
 							<button class="destroy" ng-click="removeTodo(todo)"></button>
 						</div>
 						<form ng-submit="doneEditing(todo)">
-							<input class="edit" ng-model="todo.title" todo-escape="revertEditing(todo)" todo-blur="doneEditing(todo)" todo-focus="todo == editedTodo">
+							<input class="edit" ng-trim="false" ng-model="todo.title" todo-escape="revertEditing(todo)" todo-blur="doneEditing(todo)" todo-focus="todo == editedTodo">
 						</form>
 					</li>
 				</ul>

architecture-examples/angularjs/test/config/testacular.conf.js → architecture-examples/angularjs/test/config/karma.conf.js

@@ -9,6 +9,8 @@ files = [
   'test/unit/**/*.js'
 ];
 
-autoWatch = true;
+autoWatch = false;
 
-browsers = ['Chrome'];
+singleRun = true;
+
+browsers = ['Chrome', 'Firefox'];

architecture-examples/angularjs/test/package.json

@@ -7,7 +7,7 @@
     "karma": "~0.8.5"
   },
   "scripts": {
-    "test": "karma start config/testacular.conf.js"
+    "test": "karma start config/karma.conf.js"
   },
   "dependencies": {}
 }