Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1510 from velesin/model_refactoring 

refactors Discourse.Model
This commit is contained in:
Régis Hanol 2013-10-09 09:26:15 -07:00
parent 9eb0644983 56a519c583
commit 3854c2d24f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/discourse/models/model.js
View File

@ -16,12 +16,11 @@ Discourse.Model = Ember.Object.extend(Discourse.Presence, {
@param {Object} attrs The attributes we want to merge with
**/
mergeAttributes: function(attrs) {
var _this = this;
_.each(attrs, function(v,k) {
_this.set(k, v);
var self = this;
_.each(attrs, function(v, k) {
self.set(k, v);
});
}
});
Discourse.Model.reopenClass({
@ -31,16 +30,13 @@ Discourse.Model.reopenClass({
@method extractByKey
@param {Object} collection The collection of values
@param {Object} klass Optional The class to instantiate
@param {Object} klass The class to instantiate
**/
extractByKey: function(collection, klass) {
var retval = {};
if (!collection) return retval;
_.each(collection,function(c) {
retval[c.id] = klass.create(c);
_.each(collection, function(item) {
retval[item.id] = klass.create(item);
});
return retval;
}
});