Angular app - code style and some variable name fixes

687f280d · Sindre Sorhus · 107c0e6c · 687f280d · 687f280d · 687f280d
Commit 687f280d authored Mar 09, 2013 by Sindre Sorhus
6 changed files
--- a/architecture-examples/angularjs/index.html
+++ b/architecture-examples/angularjs/index.html
 <!doctype html>
 <html lang="en" ng-app="todomvc">
-<head>
+	<head>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 		<title>AngularJS • TodoMVC</title>
 		<link rel="stylesheet" href="components/todomvc-common/base.css">
 		<style>[ng-cloak] {display: none}</style>
-</head>
-<body>
+	</head>
+	<body>
 		<section id="todoapp" ng-controller="TodoCtrl">
 			<header id="header">
 				<h1>todos</h1>
@@ -46,7 +46,7 @@
 						<a ng-class="{selected: location.path() == '/completed'}" href="#/completed">Completed</a>
 					</li>
 				</ul>
-			<button id="clear-completed" ng-click="clearDoneTodos()" ng-show="doneCount">Clear completed ({{doneCount}})</button>
+				<button id="clear-completed" ng-click="clearCompletedTodos()" ng-show="completedCount">Clear completed ({{doneCount}})</button>
 			</footer>
 		</section>
 		<footer id="info">
@@ -66,5 +66,5 @@
 		<script src="js/services/todoStorage.js"></script>
 		<script src="js/directives/todoFocus.js"></script>
 		<script src="js/directives/todoBlur.js"></script>
-</body>
+	</body>
 </html>
--- a/architecture-examples/angularjs/js/app.js
+++ b/architecture-examples/angularjs/js/app.js
-/*global angular*/
-/*jshint unused:false*/
+/*global angular */
+/*jshint unused:false */
 'use strict';

 /**
- * The main TodoMVC app module.
+ * The main TodoMVC app module
 *
 * @type {angular.Module}
 */

--- a/architecture-examples/angularjs/js/controllers/todoCtrl.js
+++ b/architecture-examples/angularjs/js/controllers/todoCtrl.js
-/*global todomvc*/
+/*global todomvc */
 'use strict';

 /**
@@ -14,7 +14,7 @@ todomvc.controller('TodoCtrl', function TodoCtrl($scope, $location, todoStorage,

 	$scope.$watch('todos', function () {
 		$scope.remainingCount = filterFilter(todos, {completed: false}).length;
-		$scope.doneCount = todos.length - $scope.remainingCount;
+		$scope.completedCount = todos.length - $scope.remainingCount;
 		$scope.allChecked = !$scope.remainingCount;
 		todoStorage.put(todos);
 	}, true);
@@ -22,6 +22,7 @@ todomvc.controller('TodoCtrl', function TodoCtrl($scope, $location, todoStorage,
 	if ($location.path() === '') {
 		$location.path('/');
 	}
+
 	$scope.location = $location;

 	$scope.$watch('location.path()', function (path) {
@@ -58,15 +59,15 @@ todomvc.controller('TodoCtrl', function TodoCtrl($scope, $location, todoStorage,
 		todos.splice(todos.indexOf(todo), 1);
 	};

-	$scope.clearDoneTodos = function () {
+	$scope.clearCompletedTodos = function () {
 		$scope.todos = todos = todos.filter(function (val) {
 			return !val.completed;
 		});
 	};

-	$scope.markAll = function (done) {
+	$scope.markAll = function (completed) {
 		todos.forEach(function (todo) {
-			todo.completed = done;
+			todo.completed = completed;
 		});
 	};
 });
--- a/architecture-examples/angularjs/js/directives/todoBlur.js
+++ b/architecture-examples/angularjs/js/directives/todoBlur.js
-/*global todomvc*/
+/*global todomvc */
 'use strict';

 /**
- * Directive that executes an expression when the element it is applied to loses focus.
+ * Directive that executes an expression when the element it is applied to loses focus
 */
 todomvc.directive('todoBlur', function () {
 	return function (scope, elem, attrs) {

--- a/architecture-examples/angularjs/js/directives/todoFocus.js
+++ b/architecture-examples/angularjs/js/directives/todoFocus.js
-/*global todomvc*/
+/*global todomvc */
 'use strict';

 /**
- * Directive that places focus on the element it is applied to when the expression it binds to evaluates to true.
+ * Directive that places focus on the element it is applied to when the expression it binds to evaluates to true
 */
 todomvc.directive('todoFocus', function todoFocus($timeout) {
 	return function (scope, elem, attrs) {
-		scope.$watch(attrs.todoFocus, function (newval) {
-			if (newval) {
+		scope.$watch(attrs.todoFocus, function (newVal) {
+			if (newVal) {
 				$timeout(function () {
 					elem[0].focus();
 				}, 0, false);

--- a/architecture-examples/angularjs/js/services/todoStorage.js
+++ b/architecture-examples/angularjs/js/services/todoStorage.js
-/*global todomvc*/
+/*global todomvc */
 'use strict';

 /**
- * Services that persists and retrieves TODOs from localStorage.
+ * Services that persists and retrieves TODOs from localStorage
 */
 todomvc.factory('todoStorage', function () {
 	var STORAGE_ID = 'todos-angularjs';