Skip to content

T
todomvc
Commit 7ded351d authored by Igor Minar's avatar Igor Minar
Browse files
Options

AngularJS: cleanup + fixes 

- simplified the code
- break up the code base into one file per component
- extract persistence into a separate module
- general cleanup
parent 4bcb50f3
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 116 deletions
architecture-examples/angularjs/index.html
View file @ 7ded351d
...@@ -5,36 +5,40 @@ ...@@ -5,36 +5,40 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>AngularJS - TodoMVC</title> <title>AngularJS - TodoMVC</title>
<link rel="stylesheet" href="../../assets/base.css"> <link rel="stylesheet" href="../../assets/base.css">
<style>[ng-cloak] {display: none}</style>
<!--[if IE]> <!--[if IE]>
<script src="../../assets/ie.js"></script> <script src="../../assets/ie.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body> <body>
<section id="todoapp" ng-controller="TodoController"> <section id="todoapp" ng-controller="TodoCtrl">
<header id="header"> <header id="header">
<h1>todos</h1> <h1>todos</h1>
<form id="todo-form" ng-submit="addTodo()"> <form id="todo-form" ng-submit="addTodo()">
<input id="new-todo" placeholder="What needs to be done?" ng-model="newTodo" autofocus> <input id="new-todo" placeholder="What needs to be done?" ng-model="newTodo" autofocus>
</form> </form>
</header> </header>
<section id="main" ng-show="todos.length"> <section id="main" ng-show="todos.length" ng-cloak>
<input id="toggle-all" type="checkbox" ng-model="allChecked" ng-change="markAllDone()" ng-checked="remainingTodos().length == 0"> <input id="toggle-all" type="checkbox" ng-model="allChecked" ng-click="markAll(allChecked)">
<label for="toggle-all">Mark all as complete</label> <label for="toggle-all">Mark all as complete</label>
<ul id="todo-list"> <ul id="todo-list">
<li ng-repeat="todo in todos | filter:statusFilter" ng-dblclick="editTodo(todo)" ng-class="{completed: todo.completed, editing: todo.editing}"> <li ng-repeat="todo in todos | filter:statusFilter" ng-dblclick="editTodo(todo)" ng-class="{completed: todo.completed, editing: todo == editedTodo}">
<div class="view"> <div class="view">
<input class="toggle" type="checkbox" name="todo.completed" ng-model="todo.completed"> <input class="toggle" type="checkbox" ng-model="todo.completed">
<label ng-bind="todo.title">Loading...</label> <label>{{todo.title}}</label>
<button class="destroy" ng-click="removeTodo(todo)"></button> <button class="destroy" ng-click="removeTodo(todo)"></button>
</div> </div>
<form ng-submit="finishEditing(todo)"> <form ng-submit="doneEditing(todo)">
<input class="edit" name="todo.title" ng-model="todo.title" todo-blur="finishEditing(todo)" todo-focus="todo.editing"> <input class="edit" ng-model="todo.title" todo-blur="doneEditing(todo)" todo-focus="todo == editedTodo">
</form> </form>
</li> </li>
</ul> </ul>
</section> </section>
<footer id="footer" ng-show="todos.length"> <footer id="footer" ng-show="todos.length" ng-cloak>
<span id="todo-count"><strong>{{remainingTodos().length}}</strong> <ng-pluralize count="remainingTodos().length" when="todoForms"></ng-pluralize></span> <span id="todo-count"><strong>{{remainingCount}}</strong>
<ng-pluralize count="remainingCount" when="{ one: 'item left', other: 'items left' }"></ng-pluralize>
</span>
<ul id="filters"> <ul id="filters">
<li> <li>
<a ng-class="{selected: location.path() == '/'} " href="#/">All</a> <a ng-class="{selected: location.path() == '/'} " href="#/">All</a>
...@@ -46,7 +50,7 @@ ...@@ -46,7 +50,7 @@
<a ng-class="{selected: location.path() == '/completed'}" href="#/completed">Completed</a> <a ng-class="{selected: location.path() == '/completed'}" href="#/completed">Completed</a>
</li> </li>
</ul> </ul>
<button id="clear-completed" ng-click="clearDoneTodos()" ng-show="completedTodos().length" ng-bind-template="Clear completed ({{completedTodos().length}})"></button> <button id="clear-completed" ng-click="clearDoneTodos()" ng-show="doneCount">Clear completed ({{doneCount}})</button>
</footer> </footer>
</section> </section>
<footer id="info"> <footer id="info">
...@@ -55,7 +59,10 @@ ...@@ -55,7 +59,10 @@
</footer> </footer>
<script src="../../assets/base.js"></script> <script src="../../assets/base.js"></script>
<script src="js/libs/angular/angular.min.js"></script> <script src="js/libs/angular/angular.min.js"></script>
<script src="js/controllers/todo.js"></script> <script src="js/app.js"></script>
<script src="js/directives/todo-directives.js"></script> <script src="js/controllers/todoCtrl.js"></script>
<script src="js/services/todoStorage.js"></script>
<script src="js/directives/todoFocus.js"></script>
<script src="js/directives/todoBlur.js"></script>
</body> </body>
</html> </html>
architecture-examples/angularjs/js/app.js 0 → 100644
View file @ 7ded351d
/**
* The main TodoMVC app module.
*
* @type {angular.Module}
*/
var todomvc = angular.module('todomvc', []);
architecture-examples/angularjs/js/controllers/todo.js deleted 100644 → 0
View file @ 4bcb50f3
/* App Controllers */
var todomvc = angular.module('todomvc', []);
function TodoController($scope, $location) {
$scope.todos = retrieveStore();
$scope.newTodo = "";
if($location.path()=='') $location.path('/');
$scope.location = $location;
// Call updateStore() whenever the todos array changes.
$scope.$watch('todos', updateStore, true);
$scope.$watch(function() {return $location.path(); }, function(path) {
$scope.statusFilter = path == '/active' ?
{ completed: false } : path == '/completed' ?
{ completed: true } : null;
});
$scope.todoForms = {
one: 'item left',
other: 'items left'
};
function retrieveStore() {
var store = localStorage.getItem('todos-angularjs');
return (store && JSON.parse(store)) || [];
};
function updateStore() {
var isEditing = $scope.todos.filter(function(val) {
return val.editing;
}).length;
if (!isEditing) {
localStorage.setItem('todos-angularjs', JSON.stringify($scope.todos));
}
};
$scope.addTodo = function() {
if (this.newTodo.trim().length === 0) {
return;
}
$scope.todos.push({
title: this.newTodo,
completed: false,
editing: false
});
this.newTodo = '';
};
$scope.editTodo = function(todo) {
//cancel any active editing operation
$scope.todos.forEach(function(val) {
val.editing = false;
});
todo.editing = true;
};
$scope.finishEditing = function(todo) {
if (todo.title.trim().length === 0) {
$scope.removeTodo(todo);
} else {
todo.editing = false;
}
};
$scope.removeTodo = function(todo) {
for (var i = 0, len = $scope.todos.length; i < len; ++i) {
if (todo === $scope.todos[i]) {
$scope.todos.splice(i, 1);
}
}
};
$scope.remainingTodos = function() {
return $scope.todos.filter(function(val) {
return !val.completed;
});
};
$scope.completedTodos = function() {
return $scope.todos.filter(function(val) {
return val.completed;
});
}
$scope.clearDoneTodos = function() {
$scope.todos = $scope.remainingTodos();
};
$scope.markAllDone = function() {
var markDone = true;
if (!$scope.remainingTodos().length) {
markDone = false;
}
$scope.todos.forEach(function(todo) {
todo.completed = markDone;
});
};
};
architecture-examples/angularjs/js/controllers/todoCtrl.js 0 → 100644
View file @ 7ded351d
/**
* The main controller for the app. The controller:
* - retrieves and persist the model via the todoStorage service
* -
* exposes the model to the template and
*/
todomvc.controller( 'TodoCtrl', function TodoCtrl( $scope, $location, todoStorage, filterFilter ) {
var todos = $scope.todos = todoStorage.get();
$scope.newTodo = "";
$scope.editedTodo = null;
$scope.$watch('todos', function() {
$scope.remainingCount = filterFilter(todos, {completed: false}).length;
$scope.doneCount = todos.length - $scope.remainingCount;
$scope.allChecked = !$scope.remainingCount
todoStorage.put(todos);
}, true);
if ( $location.path() === '' ) $location.path('/');
$scope.location = $location;
$scope.$watch( 'location.path()', function( path ) {
$scope.statusFilter = (path == '/active') ?
{ completed: false } : (path == '/completed') ?
{ completed: true } : null;
});
$scope.addTodo = function() {
if ( !$scope.newTodo.length ) {
return;
}
todos.push({
title: this.newTodo,
completed: false
});
this.newTodo = '';
};
$scope.editTodo = function( todo ) {
$scope.editedTodo = todo;
};
$scope.doneEditing = function( todo ) {
$scope.editedTodo = null;
if ( !todo.title ) {
$scope.removeTodo(todo);
}
};
$scope.removeTodo = function( todo ) {
todos.splice(todos.indexOf(todo), 1);
};
$scope.clearDoneTodos = function() {
$scope.todos = todos = todos.filter(function( val ) {
return !val.completed;
});
};
$scope.markAll = function( done ) {
todos.forEach(function( todo ) {
todo.completed = done;
});
};
});
architecture-examples/angularjs/js/directives/todoBlur.js 0 → 100644
View file @ 7ded351d
/**
* Directive that executes an expression when the element it is applied to loses focus.
*/
todomvc.directive('todoBlur', function() {
return function( scope, elem, attrs ) {
elem.bind('blur', function() {
scope.$apply(attrs.todoBlur);
});
};
});
architecture-examples/angularjs/js/directives/todo-directives.js → architecture-examples/angularjs/js/directives/todoFocus.js
View file @ 7ded351d
todomvc.directive('todoBlur', function() { /**
return function( scope, elem, attrs ) { * Directive that places focus on the element it is applied to when the expression it binds to evaluates to true.
elem.bind('blur', function() { */
scope.$apply( attrs.todoBlur );
});
};
});
todomvc.directive('todoFocus', function( $timeout ) { todomvc.directive('todoFocus', function( $timeout ) {
return function( scope, elem, attrs ) { return function( scope, elem, attrs ) {
scope.$watch( attrs.todoFocus, function( newval ) { scope.$watch(attrs.todoFocus, function( newval ) {
if ( newval ) { if ( newval ) {
$timeout(function() { $timeout(function() {
elem[0].focus(); elem[0].focus();
elem[0].select(); elem[0].select();
}, 0 ); }, 0, false);
} }
}); });
}; };
......
architecture-examples/angularjs/js/services/todoStorage.js 0 → 100644
View file @ 7ded351d
/**
* Services that persists and retrieves TODOs from localStorage.
*/
todomvc.factory( 'todoStorage', function() {
var STORAGE_ID = 'todos-angularjs';
return {
get: function() {
return JSON.parse(localStorage.getItem(STORAGE_ID) || '[]');
},
put: function( todos ) {
localStorage.setItem(STORAGE_ID, JSON.stringify(todos));
}
};
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7