Skip to content

T
todomvc
Commit 2191e029 authored by Cory Forsyth's avatar Cory Forsyth Committed by Sindre Sorhus
Browse files
Options

Close GH-670: Ember 1.0.0 and Ember Data 1.0.0-beta.1.

parent 2bb644ad
Show whitespace changes
Inline Side-by-side
Showing with 36424 additions and 19857 deletions
architecture-examples/emberjs/bower.json
View file @ 2191e029
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
"todomvc-common": "~0.1.4", "todomvc-common": "~0.1.4",
"jquery": "~1.9.1", "jquery": "~1.9.1",
"handlebars": "~1.0.0-rc.3", "handlebars": "~1.0.0-rc.3",
"ember": "~1.0.0-rc.1", "ember": "~1.0.0",
"ember-data": "1.0.0-beta.1",
"ember-localstorage-adapter": "latest" "ember-localstorage-adapter": "latest"
} }
} }
architecture-examples/emberjs/bower_components/ember-localstorage-adapter/localstorage_adapter.js
View file @ 2191e029
DS.LSSerializer = DS.JSONSerializer.extend({ /*global Ember*/
/*global DS*/
addBelongsTo: function(data, record, key, association) { 'use strict';
data[key] = record.get(key + '.id');
},
addHasMany: function(data, record, key, association) {
data[key] = record.get(key).map(function(record) {
return record.get('id');
});
},
// extract expects a root key, we don't want to save all these keys to
// localStorage so we generate the root keys here
extract: function(loader, json, type, record) {
this._super(loader, this.rootJSON(json, type), type, record);
},
extractMany: function(loader, json, type, records) {
this._super(loader, this.rootJSON(json, type, 'pluralize'), type, records);
},
rootJSON: function(json, type, pluralize) {
var root = this.rootForType(type);
if (pluralize == 'pluralize') { root = this.pluralize(root); }
var rootedJSON = {};
rootedJSON[root] = json;
return rootedJSON;
}
});
DS.LSAdapter = DS.Adapter.extend(Ember.Evented, { DS.LSAdapter = DS.Adapter.extend(Ember.Evented, {
init: function() { init: function () {
this._loadData(); this._loadData();
}, },
generateIdForRecord: function() { generateIdForRecord: function () {
return Math.random().toString(32).slice(2).substr(0,5); return Math.random().toString(32).slice(2).substr(0, 5);
}, },
serializer: DS.LSSerializer.create(), find: function (store, type, id) {
find: function(store, type, id) {
var namespace = this._namespaceForType(type); var namespace = this._namespaceForType(type);
this._async(function(){ return Ember.RSVP.resolve(Ember.copy(namespace.records[id]));
var copy = Ember.copy(namespace.records[id]);
this.didFindRecord(store, type, copy, id);
});
}, },
findMany: function(store, type, ids) { findMany: function (store, type, ids) {
var namespace = this._namespaceForType(type); var namespace = this._namespaceForType(type);
this._async(function(){
var results = []; var results = [];
for (var i = 0; i < ids.length; i++) { for (var i = 0; i < ids.length; i++) {
results.push(Ember.copy(namespace.records[ids[i]])); results.push(Ember.copy(namespace.records[ids[i]]));
} }
this.didFindMany(store, type, results); return Ember.RSVP.resolve(results);
});
}, },
// Supports queries that look like this: // Supports queries that look like this:
...@@ -75,15 +40,13 @@ DS.LSAdapter = DS.Adapter.extend(Ember.Evented, { ...@@ -75,15 +40,13 @@ DS.LSAdapter = DS.Adapter.extend(Ember.Evented, {
// match records with "complete: true" and the name "foo" or "bar" // match records with "complete: true" and the name "foo" or "bar"
// //
// { complete: true, name: /foo|bar/ } // { complete: true, name: /foo|bar/ }
findQuery: function(store, type, query, recordArray) { findQuery: function (store, type, query, recordArray) {
var namespace = this._namespaceForType(type); var namespace = this._namespaceForType(type);
this._async(function() {
var results = this.query(namespace.records, query); var results = this.query(namespace.records, query);
this.didFindQuery(store, type, results, recordArray); return Ember.RSVP.resolve(results);
});
}, },
query: function(records, query) { query: function (records, query) {
var results = []; var results = [];
var id, record, property, test, push; var id, record, property, test, push;
for (id in records) { for (id in records) {
...@@ -91,7 +54,7 @@ DS.LSAdapter = DS.Adapter.extend(Ember.Evented, { ...@@ -91,7 +54,7 @@ DS.LSAdapter = DS.Adapter.extend(Ember.Evented, {
for (property in query) { for (property in query) {
test = query[property]; test = query[property];
push = false; push = false;
if (Object.prototype.toString.call(test) == '[object RegExp]') { if (Object.prototype.toString.call(test) === '[object RegExp]') {
push = test.test(record[property]); push = test.test(record[property]);
} else { } else {
push = record[property] === test; push = record[property] === test;
...@@ -104,112 +67,62 @@ DS.LSAdapter = DS.Adapter.extend(Ember.Evented, { ...@@ -104,112 +67,62 @@ DS.LSAdapter = DS.Adapter.extend(Ember.Evented, {
return results; return results;
}, },
findAll: function(store, type) { findAll: function (store, type) {
var namespace = this._namespaceForType(type); var namespace = this._namespaceForType(type);
this._async(function() {
var results = []; var results = [];
for (var id in namespace.records) { for (var id in namespace.records) {
results.push(Ember.copy(namespace.records[id])); results.push(Ember.copy(namespace.records[id]));
} }
this.didFindAll(store, type, results); return Ember.RSVP.resolve(results);
});
}, },
createRecords: function(store, type, records) { createRecord: function (store, type, record) {
var namespace = this._namespaceForType(type); var namespace = this._namespaceForType(type);
records.forEach(function(record) {
this._addRecordToNamespace(namespace, record); this._addRecordToNamespace(namespace, record);
}, this); this._saveData();
this._async(function() { return Ember.RSVP.resolve();
this._didSaveRecords(store, type, records);
});
}, },
updateRecords: function(store, type, records) { updateRecord: function (store, type, record) {
var namespace = this._namespaceForType(type); var namespace = this._namespaceForType(type);
this._async(function() {
records.forEach(function(record) {
var id = record.get('id'); var id = record.get('id');
namespace.records[id] = record.serialize({includeId:true}); namespace.records[id] = record.toJSON({ includeId: true });
}, this); this._saveData();
this._didSaveRecords(store, type, records); return Ember.RSVP.resolve();
});
}, },
deleteRecords: function(store, type, records) { deleteRecord: function (store, type, record) {
var namespace = this._namespaceForType(type); var namespace = this._namespaceForType(type);
this._async(function() {
records.forEach(function(record) {
var id = record.get('id'); var id = record.get('id');
delete namespace.records[id]; delete namespace.records[id];
}); this._saveData();
this._didSaveRecords(store, type, records); return Ember.RSVP.resolve();
});
},
dirtyRecordsForHasManyChange: function(dirtySet, parent, relationship) {
dirtySet.add(parent);
},
dirtyRecordsForBelongsToChange: function(dirtySet, child, relationship) {
dirtySet.add(child);
}, },
// private // private
_getNamespace: function() { _getNamespace: function () {
return this.namespace || 'DS.LSAdapter'; return this.namespace || 'DS.LSAdapter';
}, },
_loadData: function() { _loadData: function () {
var storage = localStorage.getItem(this._getNamespace()); var storage = localStorage.getItem(this._getNamespace());
this._data = storage ? JSON.parse(storage) : {}; this._data = storage ? JSON.parse(storage) : {};
}, },
_didSaveRecords: function(store, type, records) { _saveData: function () {
var success = this._saveData();
if (success) {
store.didSaveRecords(records);
} else {
records.forEach(function(record) {
store.recordWasError(record);
});
this.trigger('QUOTA_EXCEEDED_ERR', records);
}
},
_saveData: function() {
try {
localStorage.setItem(this._getNamespace(), JSON.stringify(this._data)); localStorage.setItem(this._getNamespace(), JSON.stringify(this._data));
return true;
} catch(error) {
if (error.name == 'QUOTA_EXCEEDED_ERR') {
return false;
} else {
throw new Error(error);
}
}
}, },
_namespaceForType: function(type) { _namespaceForType: function (type) {
var namespace = type.url || type.toString(); var namespace = type.url || type.toString();
return this._data[namespace] || ( return this._data[namespace] || (
this._data[namespace] = {records: {}} this._data[namespace] = {records: {}}
); );
}, },
_addRecordToNamespace: function(namespace, record) { _addRecordToNamespace: function (namespace, record) {
var data = record.serialize({includeId: true}); var data = record.serialize({includeId: true});
namespace.records[data.id] = data; namespace.records[data.id] = data;
},
_async: function(callback) {
var _this = this;
setTimeout(function(){
Ember.run(_this, callback);
}, 1);
} }
}); });
architecture-examples/emberjs/bower_components/ember/ember.js
View file @ 2191e029
This source diff could not be displayed because it is too large. You can view the blob instead.
architecture-examples/emberjs/bower_components/handlebars/handlebars.js
View file @ 2191e029
...@@ -22,48 +22,59 @@ THE SOFTWARE. ...@@ -22,48 +22,59 @@ THE SOFTWARE.
*/ */
// lib/handlebars/base.js // lib/handlebars/browser-prefix.js
var Handlebars = {};
/*jshint eqnull:true*/
this.Handlebars = {};
(function(Handlebars) { (function(Handlebars, undefined) {
;
// lib/handlebars/base.js
Handlebars.VERSION = "1.0.0-rc.3"; Handlebars.VERSION = "1.0.0";
Handlebars.COMPILER_REVISION = 2; Handlebars.COMPILER_REVISION = 4;
Handlebars.REVISION_CHANGES = { Handlebars.REVISION_CHANGES = {
1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it 1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
2: '>= 1.0.0-rc.3' 2: '== 1.0.0-rc.3',
3: '== 1.0.0-rc.4',
4: '>= 1.0.0'
}; };
Handlebars.helpers = {}; Handlebars.helpers = {};
Handlebars.partials = {}; Handlebars.partials = {};
var toString = Object.prototype.toString,
functionType = '[object Function]',
objectType = '[object Object]';
Handlebars.registerHelper = function(name, fn, inverse) { Handlebars.registerHelper = function(name, fn, inverse) {
if(inverse) { fn.not = inverse; } if (toString.call(name) === objectType) {
if (inverse || fn) { throw new Handlebars.Exception('Arg not supported with multiple helpers'); }
Handlebars.Utils.extend(this.helpers, name);
} else {
if (inverse) { fn.not = inverse; }
this.helpers[name] = fn; this.helpers[name] = fn;
}
}; };
Handlebars.registerPartial = function(name, str) { Handlebars.registerPartial = function(name, str) {
if (toString.call(name) === objectType) {
Handlebars.Utils.extend(this.partials, name);
} else {
this.partials[name] = str; this.partials[name] = str;
}
}; };
Handlebars.registerHelper('helperMissing', function(arg) { Handlebars.registerHelper('helperMissing', function(arg) {
if(arguments.length === 2) { if(arguments.length === 2) {
return undefined; return undefined;
} else { } else {
throw new Error("Could not find property '" + arg + "'"); throw new Error("Missing helper: '" + arg + "'");
} }
}); });
var toString = Object.prototype.toString, functionType = "[object Function]";
Handlebars.registerHelper('blockHelperMissing', function(context, options) { Handlebars.registerHelper('blockHelperMissing', function(context, options) {
var inverse = options.inverse || function() {}, fn = options.fn; var inverse = options.inverse || function() {}, fn = options.fn;
var ret = "";
var type = toString.call(context); var type = toString.call(context);
if(type === functionType) { context = context.call(this); } if(type === functionType) { context = context.call(this); }
...@@ -114,6 +125,9 @@ Handlebars.registerHelper('each', function(context, options) { ...@@ -114,6 +125,9 @@ Handlebars.registerHelper('each', function(context, options) {
var fn = options.fn, inverse = options.inverse; var fn = options.fn, inverse = options.inverse;
var i = 0, ret = "", data; var i = 0, ret = "", data;
var type = toString.call(context);
if(type === functionType) { context = context.call(this); }
if (options.data) { if (options.data) {
data = Handlebars.createFrame(options.data); data = Handlebars.createFrame(options.data);
} }
...@@ -142,44 +156,41 @@ Handlebars.registerHelper('each', function(context, options) { ...@@ -142,44 +156,41 @@ Handlebars.registerHelper('each', function(context, options) {
return ret; return ret;
}); });
Handlebars.registerHelper('if', function(context, options) { Handlebars.registerHelper('if', function(conditional, options) {
var type = toString.call(context); var type = toString.call(conditional);
if(type === functionType) { context = context.call(this); } if(type === functionType) { conditional = conditional.call(this); }
if(!context || Handlebars.Utils.isEmpty(context)) { if(!conditional || Handlebars.Utils.isEmpty(conditional)) {
return options.inverse(this); return options.inverse(this);
} else { } else {
return options.fn(this); return options.fn(this);
} }
}); });
Handlebars.registerHelper('unless', function(context, options) { Handlebars.registerHelper('unless', function(conditional, options) {
var fn = options.fn, inverse = options.inverse; return Handlebars.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn});
options.fn = inverse;
options.inverse = fn;
return Handlebars.helpers['if'].call(this, context, options);
}); });
Handlebars.registerHelper('with', function(context, options) { Handlebars.registerHelper('with', function(context, options) {
return options.fn(context); var type = toString.call(context);
if(type === functionType) { context = context.call(this); }
if (!Handlebars.Utils.isEmpty(context)) return options.fn(context);
}); });
Handlebars.registerHelper('log', function(context, options) { Handlebars.registerHelper('log', function(context, options) {
var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1; var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
Handlebars.log(level, context); Handlebars.log(level, context);
}); });
}(this.Handlebars));
; ;
// lib/handlebars/compiler/parser.js // lib/handlebars/compiler/parser.js
/* Jison generated parser */ /* Jison generated parser */
var handlebars = (function(){ var handlebars = (function(){
var parser = {trace: function trace() { }, var parser = {trace: function trace() { },
yy: {}, yy: {},
symbols_: {"error":2,"root":3,"program":4,"EOF":5,"simpleInverse":6,"statements":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"OPEN_PARTIAL":24,"partialName":25,"params":26,"hash":27,"DATA":28,"param":29,"STRING":30,"INTEGER":31,"BOOLEAN":32,"hashSegments":33,"hashSegment":34,"ID":35,"EQUALS":36,"PARTIAL_NAME":37,"pathSegments":38,"SEP":39,"$accept":0,"$end":1}, symbols_: {"error":2,"root":3,"program":4,"EOF":5,"simpleInverse":6,"statements":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"params":27,"hash":28,"dataName":29,"param":30,"STRING":31,"INTEGER":32,"BOOLEAN":33,"hashSegments":34,"hashSegment":35,"ID":36,"EQUALS":37,"DATA":38,"pathSegments":39,"SEP":40,"$accept":0,"$end":1},
terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"OPEN_PARTIAL",28:"DATA",30:"STRING",31:"INTEGER",32:"BOOLEAN",35:"ID",36:"EQUALS",37:"PARTIAL_NAME",39:"SEP"}, terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",31:"STRING",32:"INTEGER",33:"BOOLEAN",36:"ID",37:"EQUALS",38:"DATA",40:"SEP"},
productions_: [0,[3,2],[4,2],[4,3],[4,2],[4,1],[4,1],[4,0],[7,1],[7,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[6,2],[17,3],[17,2],[17,2],[17,1],[17,1],[26,2],[26,1],[29,1],[29,1],[29,1],[29,1],[29,1],[27,1],[33,2],[33,1],[34,3],[34,3],[34,3],[34,3],[34,3],[25,1],[21,1],[38,3],[38,1]], productions_: [0,[3,2],[4,2],[4,3],[4,2],[4,1],[4,1],[4,0],[7,1],[7,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[6,2],[17,3],[17,2],[17,2],[17,1],[17,1],[27,2],[27,1],[30,1],[30,1],[30,1],[30,1],[30,1],[28,1],[34,2],[34,1],[35,3],[35,3],[35,3],[35,3],[35,3],[26,1],[26,1],[26,1],[29,2],[21,1],[39,3],[39,1]],
performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) { performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
var $0 = $$.length - 1; var $0 = $$.length - 1;
...@@ -220,7 +231,10 @@ case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]); ...@@ -220,7 +231,10 @@ case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]);
break; break;
case 18: this.$ = $$[$0-1]; case 18: this.$ = $$[$0-1];
break; break;
case 19: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]); case 19:
// Parsing out the '&' escape token at this level saves ~500 bytes after min due to the removal of one parser node.
this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2][2] === '&');
break; break;
case 20: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true); case 20: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true);
break; break;
...@@ -238,7 +252,7 @@ case 26: this.$ = [[$$[$0-1]], $$[$0]]; ...@@ -238,7 +252,7 @@ case 26: this.$ = [[$$[$0-1]], $$[$0]];
break; break;
case 27: this.$ = [[$$[$0]], null]; case 27: this.$ = [[$$[$0]], null];
break; break;
case 28: this.$ = [[new yy.DataNode($$[$0])], null]; case 28: this.$ = [[$$[$0]], null];
break; break;
case 29: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; case 29: $$[$0-1].push($$[$0]); this.$ = $$[$0-1];
break; break;
...@@ -252,7 +266,7 @@ case 33: this.$ = new yy.IntegerNode($$[$0]); ...@@ -252,7 +266,7 @@ case 33: this.$ = new yy.IntegerNode($$[$0]);
break; break;
case 34: this.$ = new yy.BooleanNode($$[$0]); case 34: this.$ = new yy.BooleanNode($$[$0]);
break; break;
case 35: this.$ = new yy.DataNode($$[$0]); case 35: this.$ = $$[$0];
break; break;
case 36: this.$ = new yy.HashNode($$[$0]); case 36: this.$ = new yy.HashNode($$[$0]);
break; break;
...@@ -268,20 +282,26 @@ case 41: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])]; ...@@ -268,20 +282,26 @@ case 41: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])];
break; break;
case 42: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])]; case 42: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])];
break; break;
case 43: this.$ = [$$[$0-2], new yy.DataNode($$[$0])]; case 43: this.$ = [$$[$0-2], $$[$0]];
break; break;
case 44: this.$ = new yy.PartialNameNode($$[$0]); case 44: this.$ = new yy.PartialNameNode($$[$0]);
break; break;
case 45: this.$ = new yy.IdNode($$[$0]); case 45: this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0]));
break;
case 46: this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0]));
break;
case 47: this.$ = new yy.DataNode($$[$0]);
break;
case 48: this.$ = new yy.IdNode($$[$0]);
break; break;
case 46: $$[$0-2].push($$[$0]); this.$ = $$[$0-2]; case 49: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2];
break; break;
case 47: this.$ = [$$[$0]]; case 50: this.$ = [{part: $$[$0]}];
break; break;
} }
}, },
table: [{3:1,4:2,5:[2,7],6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],22:[1,14],23:[1,15],24:[1,16]},{1:[3]},{5:[1,17]},{5:[2,6],7:18,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,6],22:[1,14],23:[1,15],24:[1,16]},{5:[2,5],6:20,8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,5],22:[1,14],23:[1,15],24:[1,16]},{17:23,18:[1,22],21:24,28:[1,25],35:[1,27],38:26},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],24:[2,8]},{4:28,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],24:[1,16]},{4:29,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],24:[1,16]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],24:[2,12]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],24:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],24:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],24:[2,15]},{17:30,21:24,28:[1,25],35:[1,27],38:26},{17:31,21:24,28:[1,25],35:[1,27],38:26},{17:32,21:24,28:[1,25],35:[1,27],38:26},{25:33,37:[1,34]},{1:[2,1]},{5:[2,2],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,2],22:[1,14],23:[1,15],24:[1,16]},{17:23,21:24,28:[1,25],35:[1,27],38:26},{5:[2,4],7:35,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,4],22:[1,14],23:[1,15],24:[1,16]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],24:[2,9]},{5:[2,23],14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],24:[2,23]},{18:[1,36]},{18:[2,27],21:41,26:37,27:38,28:[1,45],29:39,30:[1,42],31:[1,43],32:[1,44],33:40,34:46,35:[1,47],38:26},{18:[2,28]},{18:[2,45],28:[2,45],30:[2,45],31:[2,45],32:[2,45],35:[2,45],39:[1,48]},{18:[2,47],28:[2,47],30:[2,47],31:[2,47],32:[2,47],35:[2,47],39:[2,47]},{10:49,20:[1,50]},{10:51,20:[1,50]},{18:[1,52]},{18:[1,53]},{18:[1,54]},{18:[1,55],21:56,35:[1,27],38:26},{18:[2,44],35:[2,44]},{5:[2,3],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,3],22:[1,14],23:[1,15],24:[1,16]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],24:[2,17]},{18:[2,25],21:41,27:57,28:[1,45],29:58,30:[1,42],31:[1,43],32:[1,44],33:40,34:46,35:[1,47],38:26},{18:[2,26]},{18:[2,30],28:[2,30],30:[2,30],31:[2,30],32:[2,30],35:[2,30]},{18:[2,36],34:59,35:[1,60]},{18:[2,31],28:[2,31],30:[2,31],31:[2,31],32:[2,31],35:[2,31]},{18:[2,32],28:[2,32],30:[2,32],31:[2,32],32:[2,32],35:[2,32]},{18:[2,33],28:[2,33],30:[2,33],31:[2,33],32:[2,33],35:[2,33]},{18:[2,34],28:[2,34],30:[2,34],31:[2,34],32:[2,34],35:[2,34]},{18:[2,35],28:[2,35],30:[2,35],31:[2,35],32:[2,35],35:[2,35]},{18:[2,38],35:[2,38]},{18:[2,47],28:[2,47],30:[2,47],31:[2,47],32:[2,47],35:[2,47],36:[1,61],39:[2,47]},{35:[1,62]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],24:[2,10]},{21:63,35:[1,27],38:26},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],24:[2,11]},{14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],24:[2,16]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],24:[2,19]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],24:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],24:[2,21]},{18:[1,64]},{18:[2,24]},{18:[2,29],28:[2,29],30:[2,29],31:[2,29],32:[2,29],35:[2,29]},{18:[2,37],35:[2,37]},{36:[1,61]},{21:65,28:[1,69],30:[1,66],31:[1,67],32:[1,68],35:[1,27],38:26},{18:[2,46],28:[2,46],30:[2,46],31:[2,46],32:[2,46],35:[2,46],39:[2,46]},{18:[1,70]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],24:[2,22]},{18:[2,39],35:[2,39]},{18:[2,40],35:[2,40]},{18:[2,41],35:[2,41]},{18:[2,42],35:[2,42]},{18:[2,43],35:[2,43]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],24:[2,18]}], table: [{3:1,4:2,5:[2,7],6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],22:[1,14],23:[1,15],25:[1,16]},{1:[3]},{5:[1,17]},{5:[2,6],7:18,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,6],22:[1,14],23:[1,15],25:[1,16]},{5:[2,5],6:20,8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,5],22:[1,14],23:[1,15],25:[1,16]},{17:23,18:[1,22],21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],25:[2,8]},{4:29,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{4:30,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{17:31,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:32,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:33,21:24,29:25,36:[1,28],38:[1,27],39:26},{21:35,26:34,31:[1,36],32:[1,37],36:[1,28],39:26},{1:[2,1]},{5:[2,2],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,2],22:[1,14],23:[1,15],25:[1,16]},{17:23,21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,4],7:38,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,4],22:[1,14],23:[1,15],25:[1,16]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{5:[2,23],14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{18:[1,39]},{18:[2,27],21:44,24:[2,27],27:40,28:41,29:48,30:42,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,28],24:[2,28]},{18:[2,48],24:[2,48],31:[2,48],32:[2,48],33:[2,48],36:[2,48],38:[2,48],40:[1,51]},{21:52,36:[1,28],39:26},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],38:[2,50],40:[2,50]},{10:53,20:[1,54]},{10:55,20:[1,54]},{18:[1,56]},{18:[1,57]},{24:[1,58]},{18:[1,59],21:60,36:[1,28],39:26},{18:[2,44],36:[2,44]},{18:[2,45],36:[2,45]},{18:[2,46],36:[2,46]},{5:[2,3],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,3],22:[1,14],23:[1,15],25:[1,16]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{18:[2,25],21:44,24:[2,25],28:61,29:48,30:62,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,26],24:[2,26]},{18:[2,30],24:[2,30],31:[2,30],32:[2,30],33:[2,30],36:[2,30],38:[2,30]},{18:[2,36],24:[2,36],35:63,36:[1,64]},{18:[2,31],24:[2,31],31:[2,31],32:[2,31],33:[2,31],36:[2,31],38:[2,31]},{18:[2,32],24:[2,32],31:[2,32],32:[2,32],33:[2,32],36:[2,32],38:[2,32]},{18:[2,33],24:[2,33],31:[2,33],32:[2,33],33:[2,33],36:[2,33],38:[2,33]},{18:[2,34],24:[2,34],31:[2,34],32:[2,34],33:[2,34],36:[2,34],38:[2,34]},{18:[2,35],24:[2,35],31:[2,35],32:[2,35],33:[2,35],36:[2,35],38:[2,35]},{18:[2,38],24:[2,38],36:[2,38]},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],37:[1,65],38:[2,50],40:[2,50]},{36:[1,66]},{18:[2,47],24:[2,47],31:[2,47],32:[2,47],33:[2,47],36:[2,47],38:[2,47]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{21:67,36:[1,28],39:26},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,68]},{18:[2,24],24:[2,24]},{18:[2,29],24:[2,29],31:[2,29],32:[2,29],33:[2,29],36:[2,29],38:[2,29]},{18:[2,37],24:[2,37],36:[2,37]},{37:[1,65]},{21:69,29:73,31:[1,70],32:[1,71],33:[1,72],36:[1,28],38:[1,27],39:26},{18:[2,49],24:[2,49],31:[2,49],32:[2,49],33:[2,49],36:[2,49],38:[2,49],40:[2,49]},{18:[1,74]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{18:[2,39],24:[2,39],36:[2,39]},{18:[2,40],24:[2,40],36:[2,40]},{18:[2,41],24:[2,41],36:[2,41]},{18:[2,42],24:[2,42],36:[2,42]},{18:[2,43],24:[2,43],36:[2,43]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]}],
defaultActions: {17:[2,1],25:[2,28],38:[2,26],57:[2,24]}, defaultActions: {17:[2,1]},
parseError: function parseError(str, hash) { parseError: function parseError(str, hash) {
throw new Error(str); throw new Error(str);
}, },
...@@ -562,90 +582,89 @@ lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_STA ...@@ -562,90 +582,89 @@ lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_STA
var YYSTATE=YY_START var YYSTATE=YY_START
switch($avoiding_name_collisions) { switch($avoiding_name_collisions) {
case 0: case 0: yy_.yytext = "\\"; return 14;
break;
case 1:
if(yy_.yytext.slice(-1) !== "\\") this.begin("mu"); if(yy_.yytext.slice(-1) !== "\\") this.begin("mu");
if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1), this.begin("emu"); if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1), this.begin("emu");
if(yy_.yytext) return 14; if(yy_.yytext) return 14;
break; break;
case 1: return 14; case 2: return 14;
break; break;
case 2: case 3:
if(yy_.yytext.slice(-1) !== "\\") this.popState(); if(yy_.yytext.slice(-1) !== "\\") this.popState();
if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1); if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1);
return 14; return 14;
break; break;
case 3: yy_.yytext = yy_.yytext.substr(0, yy_.yyleng-4); this.popState(); return 15; case 4: yy_.yytext = yy_.yytext.substr(0, yy_.yyleng-4); this.popState(); return 15;
break;
case 4: this.begin("par"); return 24;
break; break;
case 5: return 16; case 5: return 25;
break; break;
case 6: return 20; case 6: return 16;
break; break;
case 7: return 19; case 7: return 20;
break; break;
case 8: return 19; case 8: return 19;
break; break;
case 9: return 23; case 9: return 19;
break; break;
case 10: return 23; case 10: return 23;
break; break;
case 11: this.popState(); this.begin('com'); case 11: return 22;
break;
case 12: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.popState(); return 15;
break; break;
case 13: return 22; case 12: this.popState(); this.begin('com');
break; break;
case 14: return 36; case 13: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.popState(); return 15;
break; break;
case 15: return 35; case 14: return 22;
break; break;
case 16: return 35; case 15: return 37;
break; break;
case 17: return 39; case 16: return 36;
break; break;
case 18: /*ignore whitespace*/ case 17: return 36;
break; break;
case 19: this.popState(); return 18; case 18: return 40;
break; break;
case 20: this.popState(); return 18; case 19: /*ignore whitespace*/
break; break;
case 21: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 30; case 20: this.popState(); return 24;
break; break;
case 22: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\'/g,"'"); return 30; case 21: this.popState(); return 18;
break; break;
case 23: yy_.yytext = yy_.yytext.substr(1); return 28; case 22: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 31;
break; break;
case 24: return 32; case 23: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\'/g,"'"); return 31;
break; break;
case 25: return 32; case 24: return 38;
break; break;
case 26: return 31; case 25: return 33;
break; break;
case 27: return 35; case 26: return 33;
break; break;
case 28: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 35; case 27: return 32;
break; break;
case 29: return 'INVALID'; case 28: return 36;
break; break;
case 30: /*ignore whitespace*/ case 29: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 36;
break; break;
case 31: this.popState(); return 37; case 30: return 'INVALID';
break; break;
case 32: return 5; case 31: return 5;
break; break;
} }
}; };
lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\{\{>)/,/^(?:\{\{#)/,/^(?:\{\{\/)/,/^(?:\{\{\^)/,/^(?:\{\{\s*else\b)/,/^(?:\{\{\{)/,/^(?:\{\{&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{)/,/^(?:=)/,/^(?:\.(?=[} ]))/,/^(?:\.\.)/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}\}\})/,/^(?:\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@[a-zA-Z]+)/,/^(?:true(?=[}\s]))/,/^(?:false(?=[}\s]))/,/^(?:[0-9]+(?=[}\s]))/,/^(?:[a-zA-Z0-9_$-]+(?=[=}\s\/.]))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:\s+)/,/^(?:[a-zA-Z0-9_$-/]+)/,/^(?:$)/]; lexer.rules = [/^(?:\\\\(?=(\{\{)))/,/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\{\{>)/,/^(?:\{\{#)/,/^(?:\{\{\/)/,/^(?:\{\{\^)/,/^(?:\{\{\s*else\b)/,/^(?:\{\{\{)/,/^(?:\{\{&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{)/,/^(?:=)/,/^(?:\.(?=[}\/ ]))/,/^(?:\.\.)/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}\}\})/,/^(?:\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=[}\s]))/,/^(?:false(?=[}\s]))/,/^(?:-?[0-9]+(?=[}\s]))/,/^(?:[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.]))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
lexer.conditions = {"mu":{"rules":[4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,32],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[3],"inclusive":false},"par":{"rules":[30,31],"inclusive":false},"INITIAL":{"rules":[0,1,32],"inclusive":true}}; lexer.conditions = {"mu":{"rules":[5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31],"inclusive":false},"emu":{"rules":[3],"inclusive":false},"com":{"rules":[4],"inclusive":false},"INITIAL":{"rules":[0,1,2,31],"inclusive":true}};
return lexer;})() return lexer;})()
parser.lexer = lexer; parser.lexer = lexer;
function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser; function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
return new Parser; return new Parser;
})();; })();;
// lib/handlebars/compiler/base.js // lib/handlebars/compiler/base.js
Handlebars.Parser = handlebars; Handlebars.Parser = handlebars;
Handlebars.parse = function(input) { Handlebars.parse = function(input) {
...@@ -656,22 +675,17 @@ Handlebars.parse = function(input) { ...@@ -656,22 +675,17 @@ Handlebars.parse = function(input) {
Handlebars.Parser.yy = Handlebars.AST; Handlebars.Parser.yy = Handlebars.AST;
return Handlebars.Parser.parse(input); return Handlebars.Parser.parse(input);
}; };
;
Handlebars.print = function(ast) {
return new Handlebars.PrintVisitor().accept(ast);
};;
// lib/handlebars/compiler/ast.js // lib/handlebars/compiler/ast.js
(function() { Handlebars.AST = {};
Handlebars.AST = {};
Handlebars.AST.ProgramNode = function(statements, inverse) { Handlebars.AST.ProgramNode = function(statements, inverse) {
this.type = "program"; this.type = "program";
this.statements = statements; this.statements = statements;
if(inverse) { this.inverse = new Handlebars.AST.ProgramNode(inverse); } if(inverse) { this.inverse = new Handlebars.AST.ProgramNode(inverse); }
}; };
Handlebars.AST.MustacheNode = function(rawParams, hash, unescaped) { Handlebars.AST.MustacheNode = function(rawParams, hash, unescaped) {
this.type = "mustache"; this.type = "mustache";
this.escaped = !unescaped; this.escaped = !unescaped;
this.hash = hash; this.hash = hash;
...@@ -691,21 +705,21 @@ Handlebars.print = function(ast) { ...@@ -691,21 +705,21 @@ Handlebars.print = function(ast) {
// if a mustache is an eligible helper but not a definite // if a mustache is an eligible helper but not a definite
// helper, it is ambiguous, and will be resolved in a later // helper, it is ambiguous, and will be resolved in a later
// pass or at runtime. // pass or at runtime.
}; };
Handlebars.AST.PartialNode = function(partialName, context) { Handlebars.AST.PartialNode = function(partialName, context) {
this.type = "partial"; this.type = "partial";
this.partialName = partialName; this.partialName = partialName;
this.context = context; this.context = context;
}; };
Handlebars.AST.BlockNode = function(mustache, program, inverse, close) {
var verifyMatch = function(open, close) { var verifyMatch = function(open, close) {
if(open.original !== close.original) { if(open.original !== close.original) {
throw new Handlebars.Exception(open.original + " doesn't match " + close.original); throw new Handlebars.Exception(open.original + " doesn't match " + close.original);
} }
}; };
Handlebars.AST.BlockNode = function(mustache, program, inverse, close) {
verifyMatch(mustache.id, close); verifyMatch(mustache.id, close);
this.type = "block"; this.type = "block";
this.mustache = mustache; this.mustache = mustache;
...@@ -715,35 +729,38 @@ Handlebars.print = function(ast) { ...@@ -715,35 +729,38 @@ Handlebars.print = function(ast) {
if (this.inverse && !this.program) { if (this.inverse && !this.program) {
this.isInverse = true; this.isInverse = true;
} }
}; };
Handlebars.AST.ContentNode = function(string) { Handlebars.AST.ContentNode = function(string) {
this.type = "content"; this.type = "content";
this.string = string; this.string = string;
}; };
Handlebars.AST.HashNode = function(pairs) { Handlebars.AST.HashNode = function(pairs) {
this.type = "hash"; this.type = "hash";
this.pairs = pairs; this.pairs = pairs;
}; };
Handlebars.AST.IdNode = function(parts) { Handlebars.AST.IdNode = function(parts) {
this.type = "ID"; this.type = "ID";
this.original = parts.join(".");
var dig = [], depth = 0; var original = "",
dig = [],
depth = 0;
for(var i=0,l=parts.length; i<l; i++) { for(var i=0,l=parts.length; i<l; i++) {
var part = parts[i]; var part = parts[i].part;
original += (parts[i].separator || '') + part;
if (part === ".." || part === "." || part === "this") { if (part === ".." || part === "." || part === "this") {
if (dig.length > 0) { throw new Handlebars.Exception("Invalid path: " + this.original); } if (dig.length > 0) { throw new Handlebars.Exception("Invalid path: " + original); }
else if (part === "..") { depth++; } else if (part === "..") { depth++; }
else { this.isScoped = true; } else { this.isScoped = true; }
} }
else { dig.push(part); } else { dig.push(part); }
} }
this.original = original;
this.parts = dig; this.parts = dig;
this.string = dig.join('.'); this.string = dig.join('.');
this.depth = depth; this.depth = depth;
...@@ -753,42 +770,43 @@ Handlebars.print = function(ast) { ...@@ -753,42 +770,43 @@ Handlebars.print = function(ast) {
this.isSimple = parts.length === 1 && !this.isScoped && depth === 0; this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
this.stringModeValue = this.string; this.stringModeValue = this.string;
}; };
Handlebars.AST.PartialNameNode = function(name) { Handlebars.AST.PartialNameNode = function(name) {
this.type = "PARTIAL_NAME"; this.type = "PARTIAL_NAME";
this.name = name; this.name = name.original;
}; };
Handlebars.AST.DataNode = function(id) { Handlebars.AST.DataNode = function(id) {
this.type = "DATA"; this.type = "DATA";
this.id = id; this.id = id;
}; };
Handlebars.AST.StringNode = function(string) { Handlebars.AST.StringNode = function(string) {
this.type = "STRING"; this.type = "STRING";
this.string = string; this.original =
this.string =
this.stringModeValue = string; this.stringModeValue = string;
}; };
Handlebars.AST.IntegerNode = function(integer) { Handlebars.AST.IntegerNode = function(integer) {
this.type = "INTEGER"; this.type = "INTEGER";
this.original =
this.integer = integer; this.integer = integer;
this.stringModeValue = Number(integer); this.stringModeValue = Number(integer);
}; };
Handlebars.AST.BooleanNode = function(bool) { Handlebars.AST.BooleanNode = function(bool) {
this.type = "BOOLEAN"; this.type = "BOOLEAN";
this.bool = bool; this.bool = bool;
this.stringModeValue = bool === "true"; this.stringModeValue = bool === "true";
}; };
Handlebars.AST.CommentNode = function(comment) { Handlebars.AST.CommentNode = function(comment) {
this.type = "comment"; this.type = "comment";
this.comment = comment; this.comment = comment;
}; };
;
})();;
// lib/handlebars/utils.js // lib/handlebars/utils.js
var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack']; var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
...@@ -811,24 +829,31 @@ Handlebars.SafeString.prototype.toString = function() { ...@@ -811,24 +829,31 @@ Handlebars.SafeString.prototype.toString = function() {
return this.string.toString(); return this.string.toString();
}; };
(function() { var escape = {
var escape = {
"&": "&amp;", "&": "&amp;",
"<": "&lt;", "<": "&lt;",
">": "&gt;", ">": "&gt;",
'"': "&quot;", '"': "&quot;",
"'": "&#x27;", "'": "&#x27;",
"`": "&#x60;" "`": "&#x60;"
}; };
var badChars = /[&<>"'`]/g; var badChars = /[&<>"'`]/g;
var possible = /[&<>"'`]/; var possible = /[&<>"'`]/;
var escapeChar = function(chr) { var escapeChar = function(chr) {
return escape[chr] || "&amp;"; return escape[chr] || "&amp;";
}; };
Handlebars.Utils = {
extend: function(obj, value) {
for(var key in value) {
if(value.hasOwnProperty(key)) {
obj[key] = value[key];
}
}
},
Handlebars.Utils = {
escapeExpression: function(string) { escapeExpression: function(string) {
// don't escape SafeStrings, since they're already safe // don't escape SafeStrings, since they're already safe
if (string instanceof Handlebars.SafeString) { if (string instanceof Handlebars.SafeString) {
...@@ -837,6 +862,11 @@ Handlebars.SafeString.prototype.toString = function() { ...@@ -837,6 +862,11 @@ Handlebars.SafeString.prototype.toString = function() {
return ""; return "";
} }
// Force a string conversion as this will be done by the append regardless and
// the regex test will do this transparently behind the scenes, causing issues if
// an object's to string has escaped characters in it.
string = string.toString();
if(!possible.test(string)) { return string; } if(!possible.test(string)) { return string; }
return string.replace(badChars, escapeChar); return string.replace(badChars, escapeChar);
}, },
...@@ -844,27 +874,26 @@ Handlebars.SafeString.prototype.toString = function() { ...@@ -844,27 +874,26 @@ Handlebars.SafeString.prototype.toString = function() {
isEmpty: function(value) { isEmpty: function(value) {
if (!value && value !== 0) { if (!value && value !== 0) {
return true; return true;
} else if(Object.prototype.toString.call(value) === "[object Array]" && value.length === 0) { } else if(toString.call(value) === "[object Array]" && value.length === 0) {
return true; return true;
} else { } else {
return false; return false;
} }
} }
}; };
})();; ;
// lib/handlebars/compiler/compiler.js // lib/handlebars/compiler/compiler.js
/*jshint eqnull:true*/ /*jshint eqnull:true*/
Handlebars.Compiler = function() {}; var Compiler = Handlebars.Compiler = function() {};
Handlebars.JavaScriptCompiler = function() {}; var JavaScriptCompiler = Handlebars.JavaScriptCompiler = function() {};
(function(Compiler, JavaScriptCompiler) { // the foundHelper register will disambiguate helper lookup from finding a
// the foundHelper register will disambiguate helper lookup from finding a // function in a context. This is necessary for mustache compatibility, which
// function in a context. This is necessary for mustache compatibility, which // requires that context functions in blocks are evaluated by blockHelperMissing,
// requires that context functions in blocks are evaluated by blockHelperMissing, // and then proceed as if the resulting value was provided to blockHelperMissing.
// and then proceed as if the resulting value was provided to blockHelperMissing.
Compiler.prototype = { Compiler.prototype = {
compiler: Compiler, compiler: Compiler,
disassemble: function() { disassemble: function() {
...@@ -908,6 +937,17 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -908,6 +937,17 @@ Handlebars.JavaScriptCompiler = function() {};
} }
} }
} }
len = this.children.length;
if (other.children.length !== len) {
return false;
}
for (i = 0; i < len; i++) {
if (!this.children[i].equals(other.children[i])) {
return false;
}
}
return true; return true;
}, },
...@@ -1027,6 +1067,10 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1027,6 +1067,10 @@ Handlebars.JavaScriptCompiler = function() {};
val = pair[1]; val = pair[1];
if (this.options.stringParams) { if (this.options.stringParams) {
if(val.depth) {
this.addDepth(val.depth);
}
this.opcode('getContext', val.depth || 0);
this.opcode('pushStringParam', val.stringModeValue, val.type); this.opcode('pushStringParam', val.stringModeValue, val.type);
} else { } else {
this.accept(val); this.accept(val);
...@@ -1110,7 +1154,7 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1110,7 +1154,7 @@ Handlebars.JavaScriptCompiler = function() {};
if (this.options.knownHelpers[name]) { if (this.options.knownHelpers[name]) {
this.opcode('invokeKnownHelper', params.length, name); this.opcode('invokeKnownHelper', params.length, name);
} else if (this.knownHelpersOnly) { } else if (this.options.knownHelpersOnly) {
throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name); throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name);
} else { } else {
this.opcode('invokeHelper', params.length, name); this.opcode('invokeHelper', params.length, name);
...@@ -1135,7 +1179,15 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1135,7 +1179,15 @@ Handlebars.JavaScriptCompiler = function() {};
DATA: function(data) { DATA: function(data) {
this.options.data = true; this.options.data = true;
this.opcode('lookupData', data.id); if (data.id.isScoped || data.id.depth) {
throw new Handlebars.Exception('Scoped data references are not supported: ' + data.original);
}
this.opcode('lookupData');
var parts = data.id.parts;
for(var i=0, l=parts.length; i<l; i++) {
this.opcode('lookup', parts[i]);
}
}, },
STRING: function(string) { STRING: function(string) {
...@@ -1240,13 +1292,13 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1240,13 +1292,13 @@ Handlebars.JavaScriptCompiler = function() {};
return params; return params;
} }
}; };
var Literal = function(value) { var Literal = function(value) {
this.value = value; this.value = value;
}; };
JavaScriptCompiler.prototype = { JavaScriptCompiler.prototype = {
// PUBLIC API: You can override these methods in a subclass to provide // PUBLIC API: You can override these methods in a subclass to provide
// alternative compiled forms for name lookup and buffering semantics // alternative compiled forms for name lookup and buffering semantics
nameLookup: function(parent, name /* , type*/) { nameLookup: function(parent, name /* , type*/) {
...@@ -1334,8 +1386,9 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1334,8 +1386,9 @@ Handlebars.JavaScriptCompiler = function() {};
if (!this.isChild) { if (!this.isChild) {
var namespace = this.namespace; var namespace = this.namespace;
var copies = "helpers = helpers || " + namespace + ".helpers;";
if (this.environment.usePartial) { copies = copies + " partials = partials || " + namespace + ".partials;"; } var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);";
if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; }
if (this.options.data) { copies = copies + " data = data || {};"; } if (this.options.data) { copies = copies + " data = data || {};"; }
out.push(copies); out.push(copies);
} else { } else {
...@@ -1364,9 +1417,11 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1364,9 +1417,11 @@ Handlebars.JavaScriptCompiler = function() {};
// Generate minimizer alias mappings // Generate minimizer alias mappings
if (!this.isChild) { if (!this.isChild) {
for (var alias in this.context.aliases) { for (var alias in this.context.aliases) {
if (this.context.aliases.hasOwnProperty(alias)) {
this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias]; this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
} }
} }
}
if (this.source[1]) { if (this.source[1]) {
this.source[1] = "var " + this.source[1].substring(2) + ";"; this.source[1] = "var " + this.source[1].substring(2) + ";";
...@@ -1583,7 +1638,7 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1583,7 +1638,7 @@ Handlebars.JavaScriptCompiler = function() {};
// //
// Push the result of looking up `id` on the current data // Push the result of looking up `id` on the current data
lookupData: function(id) { lookupData: function(id) {
this.push(this.nameLookup('data', id, 'data')); this.push('data');
}, },
// [pushStringParam] // [pushStringParam]
...@@ -1611,16 +1666,18 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1611,16 +1666,18 @@ Handlebars.JavaScriptCompiler = function() {};
if (this.options.stringParams) { if (this.options.stringParams) {
this.register('hashTypes', '{}'); this.register('hashTypes', '{}');
this.register('hashContexts', '{}');
} }
}, },
pushHash: function() { pushHash: function() {
this.hash = {values: [], types: []}; this.hash = {values: [], types: [], contexts: []};
}, },
popHash: function() { popHash: function() {
var hash = this.hash; var hash = this.hash;
this.hash = undefined; this.hash = undefined;
if (this.options.stringParams) { if (this.options.stringParams) {
this.register('hashContexts', '{' + hash.contexts.join(',') + '}');
this.register('hashTypes', '{' + hash.types.join(',') + '}'); this.register('hashTypes', '{' + hash.types.join(',') + '}');
} }
this.push('{\n ' + hash.values.join(',\n ') + '\n }'); this.push('{\n ' + hash.values.join(',\n ') + '\n }');
...@@ -1688,8 +1745,9 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1688,8 +1745,9 @@ Handlebars.JavaScriptCompiler = function() {};
this.context.aliases.helperMissing = 'helpers.helperMissing'; this.context.aliases.helperMissing = 'helpers.helperMissing';
var helper = this.lastHelper = this.setupHelper(paramSize, name, true); var helper = this.lastHelper = this.setupHelper(paramSize, name, true);
var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
this.push(helper.name); this.push(helper.name + ' || ' + nonHelper);
this.replaceStack(function(name) { this.replaceStack(function(name) {
return name + ' ? ' + name + '.call(' + return name + ' ? ' + name + '.call(' +
helper.callParams + ") " + ": helperMissing.call(" + helper.callParams + ") " + ": helperMissing.call(" +
...@@ -1763,14 +1821,18 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1763,14 +1821,18 @@ Handlebars.JavaScriptCompiler = function() {};
// and pushes the hash back onto the stack. // and pushes the hash back onto the stack.
assignToHash: function(key) { assignToHash: function(key) {
var value = this.popStack(), var value = this.popStack(),
context,
type; type;
if (this.options.stringParams) { if (this.options.stringParams) {
type = this.popStack(); type = this.popStack();
this.popStack(); context = this.popStack();
} }
var hash = this.hash; var hash = this.hash;
if (context) {
hash.contexts.push("'" + key + "': " + context);
}
if (type) { if (type) {
hash.types.push("'" + key + "': " + type); hash.types.push("'" + key + "': " + type);
} }
...@@ -1831,12 +1893,7 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1831,12 +1893,7 @@ Handlebars.JavaScriptCompiler = function() {};
else { programParams.push("depth" + (depth - 1)); } else { programParams.push("depth" + (depth - 1)); }
} }
if(depths.length === 0) { return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")";
return "self.program(" + programParams.join(", ") + ")";
} else {
programParams.shift();
return "self.programWithDepth(" + programParams.join(", ") + ")";
}
}, },
register: function(name, val) { register: function(name, val) {
...@@ -1968,7 +2025,9 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -1968,7 +2025,9 @@ Handlebars.JavaScriptCompiler = function() {};
.replace(/\\/g, '\\\\') .replace(/\\/g, '\\\\')
.replace(/"/g, '\\"') .replace(/"/g, '\\"')
.replace(/\n/g, '\\n') .replace(/\n/g, '\\n')
.replace(/\r/g, '\\r') + '"'; .replace(/\r/g, '\\r')
.replace(/\u2028/g, '\\u2028') // Per Ecma-262 7.3 + 7.8.4
.replace(/\u2029/g, '\\u2029') + '"';
}, },
setupHelper: function(paramSize, name, missingParams) { setupHelper: function(paramSize, name, missingParams) {
...@@ -2024,6 +2083,7 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -2024,6 +2083,7 @@ Handlebars.JavaScriptCompiler = function() {};
if (this.options.stringParams) { if (this.options.stringParams) {
options.push("contexts:[" + contexts.join(",") + "]"); options.push("contexts:[" + contexts.join(",") + "]");
options.push("types:[" + types.join(",") + "]"); options.push("types:[" + types.join(",") + "]");
options.push("hashContexts:hashContexts");
options.push("hashTypes:hashTypes"); options.push("hashTypes:hashTypes");
} }
...@@ -2040,9 +2100,9 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -2040,9 +2100,9 @@ Handlebars.JavaScriptCompiler = function() {};
} }
return params.join(", "); return params.join(", ");
} }
}; };
var reservedWords = ( var reservedWords = (
"break else new var" + "break else new var" +
" case finally return void" + " case finally return void" +
" catch for switch while" + " catch for switch while" +
...@@ -2058,26 +2118,24 @@ Handlebars.JavaScriptCompiler = function() {}; ...@@ -2058,26 +2118,24 @@ Handlebars.JavaScriptCompiler = function() {};
" const goto private transient" + " const goto private transient" +
" debugger implements protected volatile" + " debugger implements protected volatile" +
" double import public let yield" " double import public let yield"
).split(" "); ).split(" ");
var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {}; var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
for(var i=0, l=reservedWords.length; i<l; i++) { for(var i=0, l=reservedWords.length; i<l; i++) {
compilerWords[reservedWords[i]] = true; compilerWords[reservedWords[i]] = true;
} }
JavaScriptCompiler.isValidJavaScriptVariableName = function(name) { JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) { if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) {
return true; return true;
} }
return false; return false;
}; };
})(Handlebars.Compiler, Handlebars.JavaScriptCompiler);
Handlebars.precompile = function(input, options) { Handlebars.precompile = function(input, options) {
if (!input || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) { if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input); throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
} }
options = options || {}; options = options || {};
...@@ -2085,12 +2143,12 @@ Handlebars.precompile = function(input, options) { ...@@ -2085,12 +2143,12 @@ Handlebars.precompile = function(input, options) {
options.data = true; options.data = true;
} }
var ast = Handlebars.parse(input); var ast = Handlebars.parse(input);
var environment = new Handlebars.Compiler().compile(ast, options); var environment = new Compiler().compile(ast, options);
return new Handlebars.JavaScriptCompiler().compile(environment, options); return new JavaScriptCompiler().compile(environment, options);
}; };
Handlebars.compile = function(input, options) { Handlebars.compile = function(input, options) {
if (!input || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) { if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input); throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
} }
...@@ -2101,8 +2159,8 @@ Handlebars.compile = function(input, options) { ...@@ -2101,8 +2159,8 @@ Handlebars.compile = function(input, options) {
var compiled; var compiled;
function compile() { function compile() {
var ast = Handlebars.parse(input); var ast = Handlebars.parse(input);
var environment = new Handlebars.Compiler().compile(ast, options); var environment = new Compiler().compile(ast, options);
var templateSpec = new Handlebars.JavaScriptCompiler().compile(environment, options, undefined, true); var templateSpec = new JavaScriptCompiler().compile(environment, options, undefined, true);
return Handlebars.template(templateSpec); return Handlebars.template(templateSpec);
} }
...@@ -2114,8 +2172,10 @@ Handlebars.compile = function(input, options) { ...@@ -2114,8 +2172,10 @@ Handlebars.compile = function(input, options) {
return compiled.call(this, context, options); return compiled.call(this, context, options);
}; };
}; };
; ;
// lib/handlebars/runtime.js // lib/handlebars/runtime.js
Handlebars.VM = { Handlebars.VM = {
template: function(templateSpec) { template: function(templateSpec) {
// Just add water // Just add water
...@@ -2126,13 +2186,21 @@ Handlebars.VM = { ...@@ -2126,13 +2186,21 @@ Handlebars.VM = {
program: function(i, fn, data) { program: function(i, fn, data) {
var programWrapper = this.programs[i]; var programWrapper = this.programs[i];
if(data) { if(data) {
return Handlebars.VM.program(fn, data); programWrapper = Handlebars.VM.program(i, fn, data);
} else if(programWrapper) { } else if (!programWrapper) {
return programWrapper; programWrapper = this.programs[i] = Handlebars.VM.program(i, fn);
} else { }
programWrapper = this.programs[i] = Handlebars.VM.program(fn);
return programWrapper; return programWrapper;
},
merge: function(param, common) {
var ret = param || common;
if (param && common) {
ret = {};
Handlebars.Utils.extend(ret, common);
Handlebars.Utils.extend(ret, param);
} }
return ret;
}, },
programWithDepth: Handlebars.VM.programWithDepth, programWithDepth: Handlebars.VM.programWithDepth,
noop: Handlebars.VM.noop, noop: Handlebars.VM.noop,
...@@ -2164,21 +2232,27 @@ Handlebars.VM = { ...@@ -2164,21 +2232,27 @@ Handlebars.VM = {
}; };
}, },
programWithDepth: function(fn, data, $depth) { programWithDepth: function(i, fn, data /*, $depth */) {
var args = Array.prototype.slice.call(arguments, 2); var args = Array.prototype.slice.call(arguments, 3);
return function(context, options) { var program = function(context, options) {
options = options || {}; options = options || {};
return fn.apply(this, [context, options.data || data].concat(args)); return fn.apply(this, [context, options.data || data].concat(args));
}; };
program.program = i;
program.depth = args.length;
return program;
}, },
program: function(fn, data) { program: function(i, fn, data) {
return function(context, options) { var program = function(context, options) {
options = options || {}; options = options || {};
return fn(context, options.data || data); return fn(context, options.data || data);
}; };
program.program = i;
program.depth = 0;
return program;
}, },
noop: function() { return ""; }, noop: function() { return ""; },
invokePartial: function(partial, name, context, helpers, partials, data) { invokePartial: function(partial, name, context, helpers, partials, data) {
...@@ -2199,3 +2273,6 @@ Handlebars.VM = { ...@@ -2199,3 +2273,6 @@ Handlebars.VM = {
Handlebars.template = Handlebars.VM.template; Handlebars.template = Handlebars.VM.template;
; ;
// lib/handlebars/browser-suffix.js
})(Handlebars);
;
architecture-examples/emberjs/index.html
View file @ 2191e029
...@@ -11,41 +11,40 @@ ...@@ -11,41 +11,40 @@
<section id="todoapp"> <section id="todoapp">
<header id="header"> <header id="header">
<h1>todos</h1> <h1>todos</h1>
{{view Ember.TextField id="new-todo" placeholder="What needs to be done?" {{input id="new-todo" type="text" value=newTitle action="createTodo" placeholder="What needs to be done?"}}
valueBinding="newTitle" action="createTodo"}}
</header> </header>
{{#if length}} {{#if length}}
<section id="main"> <section id="main">
<ul id="todo-list"> <ul id="todo-list">
{{#each filteredTodos itemController="todo"}} {{#each filteredTodos itemController="todo"}}
<li {{bindAttr class="isCompleted:completed isEditing:editing"}}> <li {{bind-attr class="isCompleted:completed isEditing:editing"}}>
{{#if isEditing}} {{#if isEditing}}
{{view Todos.EditTodoView todoBinding="this"}} {{edit-todo class="edit" value=bufferedTitle focus-out="doneEditing" insert-newline="doneEditing" escape-press="cancelEditing"}}
{{else}} {{else}}
{{view Ember.Checkbox checkedBinding="isCompleted" class="toggle"}} {{input type="checkbox" class="toggle" checked=isCompleted}}
<label {{action "editTodo" on="doubleClick"}}>{{title}}</label> <label {{action "editTodo" on="doubleClick"}}>{{title}}</label>
<button {{action "removeTodo"}} class="destroy"></button> <button {{action "removeTodo"}} class="destroy"></button>
{{/if}} {{/if}}
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
{{view Ember.Checkbox id="toggle-all" checkedBinding="allAreDone"}} {{input type="checkbox" id="toggle-all" checked=allAreDone}}
</section> </section>
<footer id="footer"> <footer id="footer">
<span id="todo-count">{{{remainingFormatted}}}</span> <span id="todo-count">{{{remainingFormatted}}}</span>
<ul id="filters"> <ul id="filters">
<li> <li>
{{#linkTo todos.index activeClass="selected"}}All{{/linkTo}} {{#link-to "todos.index" activeClass="selected"}}All{{/link-to}}
</li> </li>
<li> <li>
{{#linkTo todos.active activeClass="selected"}}Active{{/linkTo}} {{#link-to "todos.active" activeClass="selected"}}Active{{/link-to}}
</li> </li>
<li> <li>
{{#linkTo todos.completed activeClass="selected"}}Completed{{/linkTo}} {{#link-to "todos.completed" activeClass="selected"}}Completed{{/link-to}}
</li> </li>
</ul> </ul>
{{#if hasCompleted}} {{#if hasCompleted}}
<button id="clear-completed" {{action "clearCompleted"}} {{bindAttr class="buttonClass:hidden"}}> <button id="clear-completed" {{action "clearCompleted"}}>
Clear completed ({{completed}}) Clear completed ({{completed}})
</button> </button>
{{/if}} {{/if}}
...@@ -66,13 +65,11 @@ ...@@ -66,13 +65,11 @@
<script src="bower_components/jquery/jquery.js"></script> <script src="bower_components/jquery/jquery.js"></script>
<script src="bower_components/handlebars/handlebars.js"></script> <script src="bower_components/handlebars/handlebars.js"></script>
<script src="bower_components/ember/ember.js"></script> <script src="bower_components/ember/ember.js"></script>
<!-- TODO: change out with a component when a built one is available on Bower --> <script src="bower_components/ember-data/ember-data.js"></script>
<script src="js/libs/ember-data.js"></script>
<script src="bower_components/ember-localstorage-adapter/localstorage_adapter.js"></script> <script src="bower_components/ember-localstorage-adapter/localstorage_adapter.js"></script>
<script src="js/app.js"></script> <script src="js/app.js"></script>
<script src="js/router.js"></script> <script src="js/router.js"></script>
<script src="js/models/todo.js"></script> <script src="js/models/todo.js"></script>
<script src="js/models/store.js"></script>
<script src="js/controllers/todos_controller.js"></script> <script src="js/controllers/todos_controller.js"></script>
<script src="js/controllers/todo_controller.js"></script> <script src="js/controllers/todo_controller.js"></script>
<script src="js/views/edit_todo_view.js"></script> <script src="js/views/edit_todo_view.js"></script>
......
architecture-examples/emberjs/js/app.js
View file @ 2191e029
/*global Ember */ /*global Ember, DS, Todos:true */
window.Todos = Ember.Application.create(); window.Todos = Ember.Application.create();
Todos.ApplicationAdapter = DS.LSAdapter.extend({
namespace: 'todos-emberjs'
});
architecture-examples/emberjs/js/controllers/todo_controller.js
View file @ 2191e029
/*global Todos Ember */ /*global Todos, Ember */
'use strict'; 'use strict';
Todos.TodoController = Ember.ObjectController.extend({ Todos.TodoController = Ember.ObjectController.extend({
isEditing: false, isEditing: false,
// We use the bufferedTitle to store the original value of
// the model's title so that we can roll it back later in the
// `cancelEditing` action.
bufferedTitle: Ember.computed.oneWay('title'),
actions: {
editTodo: function () { editTodo: function () {
this.set('isEditing', true); this.set('isEditing', true);
}, },
doneEditing: function () {
var bufferedTitle = this.get('bufferedTitle');
if (Ember.isEmpty(bufferedTitle.trim())) {
// The `doneEditing` action gets sent twice when the user hits
// enter (once via 'insert-newline' and once via 'focus-out').
//
// We debounce our call to 'removeTodo' so that it only gets
// sent once.
Ember.run.debounce(this, this.send, 'removeTodo', 0);
} else {
var todo = this.get('model');
todo.set('title', this.get('bufferedTitle'));
todo.save();
}
this.set('isEditing', false);
},
cancelEditing: function () {
this.set('bufferedTitle', this.get('title'));
this.set('isEditing', false);
},
removeTodo: function () { removeTodo: function () {
var todo = this.get('model'); var todo = this.get('model');
todo.deleteRecord(); todo.deleteRecord();
todo.get('store').commit(); todo.save();
}
} }
}); });
architecture-examples/emberjs/js/controllers/todos_controller.js
View file @ 2191e029
/*global Todos Ember */ /*global Todos, Ember */
'use strict'; 'use strict';
Todos.TodosController = Ember.ArrayController.extend({ Todos.TodosController = Ember.ArrayController.extend({
actions: {
createTodo: function () { createTodo: function () {
var title, todo;
// Get the todo title set by the "New Todo" text field // Get the todo title set by the "New Todo" text field
var title = this.get('newTitle'); title = this.get('newTitle');
if (!title.trim()) { if (!title.trim()) {
return; return;
} }
// Create the new Todo model // Create the new Todo model
Todos.Todo.createRecord({ todo = this.store.createRecord('todo', {
title: title, title: title,
isCompleted: false isCompleted: false
}); });
todo.save();
// Clear the "New Todo" text field // Clear the "New Todo" text field
this.set('newTitle', ''); this.set('newTitle', '');
// Save the new model
this.get('store').commit();
}, },
clearCompleted: function () { clearCompleted: function () {
var completed = this.filterProperty('isCompleted', true); var completed = this.filterProperty('isCompleted', true);
completed.invoke('deleteRecord'); completed.invoke('deleteRecord');
completed.invoke('save');
this.get('store').commit(); },
}, },
remaining: function () { remaining: function () {
......
architecture-examples/emberjs/js/models/store.js deleted 100644 → 0
View file @ 2bb644ad
/*global Todos DS */
'use strict';
Todos.Store = DS.Store.extend({
revision: 12,
adapter: 'Todos.LSAdapter'
});
Todos.LSAdapter = DS.LSAdapter.extend({
namespace: 'todos-emberjs'
});
architecture-examples/emberjs/js/models/todo.js
View file @ 2191e029
/*global Todos DS Ember */ /*global Todos, DS */
'use strict'; 'use strict';
Todos.Todo = DS.Model.extend({ Todos.Todo = DS.Model.extend({
title: DS.attr('string'), title: DS.attr('string'),
isCompleted: DS.attr('boolean'), isCompleted: DS.attr('boolean'),
todoDidChange: function () { saveWhenCompletedChanged: function () {
Ember.run.once(this, function () { this.save();
this.get('store').commit(); }.observes('isCompleted')
});
}.observes('isCompleted', 'title')
}); });
architecture-examples/emberjs/js/router.js
View file @ 2191e029
/*global Todos Ember */ /*global Ember, Todos */
'use strict'; 'use strict';
Todos.Router.map(function () { Todos.Router.map(function () {
...@@ -10,23 +10,20 @@ Todos.Router.map(function () { ...@@ -10,23 +10,20 @@ Todos.Router.map(function () {
Todos.TodosRoute = Ember.Route.extend({ Todos.TodosRoute = Ember.Route.extend({
model: function () { model: function () {
return Todos.Todo.find(); return this.store.find('todo');
} }
}); });
Todos.TodosIndexRoute = Ember.Route.extend({ Todos.TodosIndexRoute = Ember.Route.extend({
setupController: function () { setupController: function () {
var todos = Todos.Todo.find(); this.controllerFor('todos').set('filteredTodos', this.modelFor('todos'));
this.controllerFor('todos').set('filteredTodos', todos);
} }
}); });
Todos.TodosActiveRoute = Ember.Route.extend({ Todos.TodosActiveRoute = Ember.Route.extend({
setupController: function () { setupController: function () {
var todos = Todos.Todo.filter(function (todo) { var todos = this.store.filter('todo', function (todo) {
if (!todo.get('isCompleted')) { return !todo.get('isCompleted');
return true;
}
}); });
this.controllerFor('todos').set('filteredTodos', todos); this.controllerFor('todos').set('filteredTodos', todos);
...@@ -35,10 +32,8 @@ Todos.TodosActiveRoute = Ember.Route.extend({ ...@@ -35,10 +32,8 @@ Todos.TodosActiveRoute = Ember.Route.extend({
Todos.TodosCompletedRoute = Ember.Route.extend({ Todos.TodosCompletedRoute = Ember.Route.extend({
setupController: function () { setupController: function () {
var todos = Todos.Todo.filter(function (todo) { var todos = this.store.filter('todo', function (todo) {
if (todo.get('isCompleted')) { return todo.get('isCompleted');
return true;
}
}); });
this.controllerFor('todos').set('filteredTodos', todos); this.controllerFor('todos').set('filteredTodos', todos);
......
architecture-examples/emberjs/js/views/edit_todo_view.js
View file @ 2191e029
/*global Todos Ember */ /*global Todos, Ember */
'use strict'; 'use strict';
Todos.EditTodoView = Ember.TextField.extend({ Todos.EditTodoView = Ember.TextField.extend({
classNames: ['edit'], focusOnInsert: function () {
valueBinding: 'todo.title',
change: function () {
var value = this.get('value');
if (Ember.isEmpty(value)) {
this.get('controller').removeTodo();
}
},
focusOut: function () {
this.set('controller.isEditing', false);
},
insertNewline: function () {
this.set('controller.isEditing', false);
},
didInsertElement: function () {
this.$().focus(); this.$().focus();
} }.on('didInsertElement')
}); });
Ember.Handlebars.helper('edit-todo', Todos.EditTodoView);
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