Skip to content

T
todomvc
Commit 3b8c596a authored by Stephen Sawchuk's avatar Stephen Sawchuk
Browse files
Options

Merge pull request #591 from stephenplusplus/epitome-bug 

Epitome Code Style + Spec Issue
parents cc132b80 29f9c0a7
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 93 deletions
labs/architecture-examples/epitome/bower.json
View file @ 3b8c596a
......@@ -2,7 +2,7 @@
"name": "todomvc-epitome",
"version": "0.0.0",
"dependencies": {
"epitome": "0.3.1",
"todomvc-common": "~0.1.6"
"todomvc-common": "~0.1.6",
"Epitome": "~0.3.1"
}
}
labs/architecture-examples/epitome/index.html
View file @ 3b8c596a
......@@ -22,7 +22,7 @@
<footer id="info">
<p>Double-click to edit a todo</p>
<p>Created by <a href="https://github.com/DimitarChristoff/">Dimitar Christoff</a></p>
<p>Powered by <a href="http://dimitarchristoff.github.com/Epitome">Epitome for MooTools</a></p>
<p>Powered by <a href="http://epitome-mvc.github.io/Epitome">Epitome for MooTools</a></p>
<p>Part of <a href="http://todomvc.com">TodoMVC</a></p>
</footer>
<script type="text/template" id="item-template">
......@@ -34,7 +34,9 @@
<input class="edit" value="<%=title%>">
</script>
<script type="text/template" id="stats-template">
<span id="todo-count"><strong><%=remaining%></strong> item<% if (obj.remaining !== 1) { %>s<% } %> left</span>
<span id="todo-count">
<strong><%=remaining%></strong> item<% if (obj.remaining !== 1) { %>s<% } %> left
</span>
<ul id="filters">
<li>
<a class="selected" href="#!/">All</a>
......@@ -54,7 +56,7 @@
<!-- mootools -->
<script src="js/lib/mootools-yui-compressed.js"></script>
<!-- epitome pre-compiled -->
<script src="bower_components/epitome/Epitome-min.js"></script>
<script src="bower_components/Epitome/Epitome-min.js"></script>
<!-- todo app -->
<script src="js/models/todo-model.js"></script>
<script src="js/collections/todo-collection.js"></script>
......
labs/architecture-examples/epitome/js/app.js
View file @ 3b8c596a
/*global Epitome */
/*jshint mootools:true */
(function( window ) {
(function (window) {
'use strict';
var App = window.App;
var todos = new App.TodoCollection( null, {
var todos = new App.TodoCollection(null, {
// a consistent collection if is needed if you want to use storage for a collection
id: 'todos'
});
// populate from storage if available
todos.setUp( todos.retrieve() );
todos.setUp(todos.retrieve());
// instantiate the todo list view
App.todoView = new App.TodoView({
......@@ -20,10 +19,10 @@
collection: todos,
// encapsulating element to bind to
element: document.id( 'todo-list' ),
element: document.id('todo-list'),
// template to use
template: document.id( 'item-template' ).get( 'text' )
template: document.id('item-template').get('text')
});
......@@ -37,11 +36,11 @@
element: document.id('todoapp'),
// stats template from DOM
template: document.id( 'stats-template' ).get( 'text' ),
template: document.id('stats-template').get('text'),
onReady: function() {
onReady: function () {
// need to work with controller that sets the current state of filtering
var proxy = function() {
var proxy = function () {
App.router.showActiveFilter();
};
......@@ -57,12 +56,12 @@
'#!/:filter': 'applyFilter'
},
onInit: function() {
onInit: function () {
// we want to always have a state
this.navigate( '#!/' );
this.navigate('#!/');
},
onApplyFilter: function( filter ) {
onApplyFilter: function (filter) {
// the filter is being used by the todo collection and view.
// when false, the whole collection is being passed.
todos.filterType = filter || false;
......@@ -73,4 +72,4 @@
this.showActiveFilter();
}
});
}( window ));
})(window);
labs/architecture-examples/epitome/js/collections/todo-collection.js
View file @ 3b8c596a
/*global Epitome, App */
/*jshint mootools:true */
(function(window) {
(function (window) {
'use strict';
window.App = window.App || {};
......@@ -21,9 +21,9 @@
completed: 1
},
todoFilter: function( model ) {
todoFilter: function (model) {
// references the filterType which the controller sets
return this.filterType === false ? true : this.map[this.filterType] === +model.get( 'completed' );
return this.filterType === false ? true : this.map[this.filterType] === +model.get('completed');
}
});
}( window ));
})(window);
labs/architecture-examples/epitome/js/controllers/todo-router.js
View file @ 3b8c596a
/*global Epitome, App */
/*jshint mootools:true */
(function(window) {
(function (window) {
'use strict';
window.App = window.App || {};
......@@ -9,14 +9,14 @@
Extends: Epitome.Router,
showActiveFilter: function() {
showActiveFilter: function () {
// fix up the links for current filter
var self = this;
document.getElements( '#filters li a' ).each(function( link ) {
link.set( 'class', link.get( 'href' ) === self.req ? 'selected' : '' );
document.getElements('#filters li a').each(function (link) {
link.set('class', link.get('href') === self.req ? 'selected' : '');
});
}
});
}( window ));
})(window);
labs/architecture-examples/epitome/js/models/todo-model.js
View file @ 3b8c596a
/*global Epitome, App */
/*jshint mootools:true */
(function(window) {
(function (window) {
'use strict';
window.App = window.App || {};
......@@ -28,4 +28,4 @@
model: App.Todo
});
}( window ));
})(window);
labs/architecture-examples/epitome/js/views/todo-list.js
View file @ 3b8c596a
/*global Epitome, App */
/*jshint mootools:true */
(function( window ) {
(function (window) {
'use strict';
window.App = window.App || {};
......@@ -29,89 +29,91 @@
},
// define actual event handlers
onReady: function() {
onReady: function () {
// initial view
this.render();
},
// when collection changes, save the data to storage and re-render
'onChange:collection': function( model ) {
'onChange:collection': function () {
this.collection.store();
this.render();
},
// when models get removed, re-render
'onRemove:collection': function( model ) {
'onRemove:collection': function () {
this.collection.store();
this.render();
},
// when sort is applied, re-render
'onSort:collection': function() {
'onSort:collection': function () {
this.collection.store();
this.render();
},
// when a new model is added, re-render
'onAdd:collection': function( model ) {
'onAdd:collection': function () {
this.collection.store();
this.render();
},
// handler for the edit event
onEditing: function( e, el ) {
if ( e && e.stop ) {
onEditing: function (e, el) {
if (e && e.stop) {
e.stop();
}
var container = el.getParent('li');
container.addClass( this.options.editingClass );
container.getElement( this.options.input ).focus();
var input = container.getElement(this.options.input);
container.addClass(this.options.editingClass);
input.focus();
input.value = input.value;
},
// when enter pressed while editing
onHandleKeypress: function( e, el ) {
onHandleKeypress: function (e, el) {
// on enter, blur() and let it bubble to onUpdate.
if ( e.key === 'enter' ) {
if (e.key === 'enter') {
el.blur();
}
},
// fired when editing ends
onUpdate: function( e, el ) {
var p = el.getParent( 'li ').removeClass( this.options.editingClass );
var val = el.get( 'value' ).trim();
onUpdate: function (e, el) {
var p = el.getParent('li').removeClass(this.options.editingClass);
var val = el.get('value').trim();
if ( !val.length ) {
if (!val.length) {
// the render method stores the model into the element, get it and remove
this.collection.removeModel( p.retrieve( 'model' ) );
this.collection.removeModel(p.retrieve('model'));
return;
}
p.retrieve( 'model' ).set( 'title', val );
p.retrieve('model').set('title', val);
},
// handler for clicks on the checkboxes
onStatusChange: function( e, el ) {
var p = el.getParent( 'li' );
var done = !!el.get( 'checked' );
onStatusChange: function (e, el) {
var p = el.getParent('li');
var done = !!el.get('checked');
p.retrieve( 'model' ).set( 'completed', done );
p.retrieve('model').set('completed', done);
},
// when the X is pressed, drop the model
onRemoveItem: function( e, el ) {
if ( e && e.stop ) {
onRemoveItem: function (e, el) {
if (e && e.stop) {
e.stop();
}
// the render method stores the model into the element, get it and remove
this.collection.removeModel( el.getParent( 'li' ).retrieve( 'model' ) );
this.collection.removeModel(el.getParent('li').retrieve('model'));
}
},
render: function() {
render: function () {
// main render method, will also fire onRender
var todos = new Elements();
var self = this;
......@@ -120,23 +122,23 @@
this.empty();
// the route controller works with the todoFilter to help determine what we render.
this.collection.filter( this.collection.todoFilter.bind( this.collection ) ).each(function( model ) {
this.collection.filter(this.collection.todoFilter.bind(this.collection)).each(function (model) {
var obj = model.toJSON();
var li = new Element( self.tagName ).toggleClass( 'completed', obj.completed ).store( 'model', model );
var li = new Element(self.tagName).toggleClass('completed', obj.completed).store('model', model);
// help the template to avoid slower logic in the template layer
obj.completedCheckbox = obj.completed ? 'checked' : '';
// compile template and store resulting element in our Elements collection
todos.push( li.set( 'html', self.template( obj ) ) );
todos.push(li.set('html', self.template(obj)));
});
// inject the elements collection into the container element
this.element.adopt( todos );
this.element.adopt(todos);
// propagate the render event.
this.parent();
return this;
}
});
}( window ));
})(window);
labs/architecture-examples/epitome/js/views/todo-main.js
View file @ 3b8c596a
/*global Epitome, App */
/*jshint mootools:true */
(function( window ) {
(function (window) {
'use strict';
window.App = window.App || {};
......@@ -25,70 +25,77 @@
footer: 'footer',
main: 'main',
filters: '#filters li a',
toggleAll: 'toggle-all',
onToggleAll: function( e, el ) {
onToggleAll: function (e, el) {
// all todos will change their models to the new completed value
var state = !!el.get( 'checked' );
this.collection.each( function( model ) {
model.set( 'completed', state );
var state = !!el.get('checked');
this.collection.each(function (model) {
model.set('completed', state);
});
},
onHandleKeypress: function( e, el ) {
onHandleKeypress: function (e) {
// on enter, submit.
if ( e.key === 'enter' ) {
if (e.key === 'enter') {
this.addTodo();
}
},
onClearCompleted: function() {
onClearCompleted: function () {
// because removing a model re-indexes so we don't get a sparse array, cannot apply that in a normal loop.
var toRemove = this.collection.filter(function( model ) {
return model.get( 'completed' );
var toRemove = this.collection.filter(function (model) {
return model.get('completed');
});
// removeModel actually supports a single model or an array of models as arguments.
this.collection.removeModel( toRemove );
this.collection.removeModel(toRemove);
this.render();
},
onAddTodo: function() {
onAddTodo: function () {
// go to method
this.addTodo();
},
'onChange:collection': function() {
'onChange:collection': function () {
// also, re-render on change of collection
this.render();
},
'onAdd:collection': function() {
'onRemove:collection': function () {
this.render();
},
'onAdd:collection': function () {
// when adding, re-render.
this.render();
}
},
initialize: function( options ) {
initialize: function (options) {
// call default view constructor.
this.parent( options );
this.parent(options);
// store some pointers to static elements
this.newTodo = document.id( this.options.newTodo );
this.footer = document.id( this.options.footer );
this.toggleAll = document.id( this.options.toggleAll );
this.newTodo = document.id(this.options.newTodo);
this.footer = document.id(this.options.footer);
this.toggleAll = document.id(this.options.toggleAll);
this.main = document.id(this.options.main);
// draw it.
this.render();
},
addTodo: function() {
addTodo: function () {
// adding a new model when data exists
var val = this.newTodo.get( 'value' ).trim();
var val = this.newTodo.get('value').trim();
if ( val.length ) {
if (val.length) {
this.collection.addModel({
title: val,
completed: false
......@@ -96,33 +103,37 @@
}
// clear the input
this.newTodo.set( 'value', '' );
this.newTodo.set('value', '');
},
render: function() {
render: function () {
// main method to output everything. well. the footer anyway.
// work out what we have remaining and what is complete
var remaining = 0;
var completed = this.collection.filter(function( model ) {
var status = model.get( 'completed' );
var completed = this.collection.filter(function (model) {
var status = model.get('completed');
if ( status === false ) {
if (status === false) {
remaining++;
}
return status;
}).length;
var visibleClass = remaining || completed ? '' : 'hidden';
// output footer
this.footer.set( 'html', this.template({
this.footer.set('html', this.template({
completed: completed,
remaining: remaining
}));
})).set('class', visibleClass);
this.main.set('class', visibleClass);
// auto-correct the toggle-all checkbox with the new stats.
this.toggleAll.set( 'checked', this.collection.length ? !remaining : false );
this.toggleAll.set('checked', this.collection.length ? !remaining : false);
}
});
}( window ));
})(window);
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