Comparing version 0.2.4 to 0.2.5
@@ -6,3 +6,3 @@ { | ||
"version": "0.1.13", | ||
"version": "0.2.4", | ||
"version": "0.2.5", | ||
"keywords": [ | ||
@@ -9,0 +9,0 @@ "clientside" |
@@ -10,3 +10,3 @@ define(function() { | ||
// Hr version | ||
"version": "0.2.4", | ||
"version": "0.2.5", | ||
@@ -13,0 +13,0 @@ // Log level |
define([ | ||
"underscore", | ||
"q", | ||
"hr/configs", | ||
@@ -9,3 +10,3 @@ "hr/class", | ||
"hr/i18n" | ||
], function(_, configs, Class, Logger, Urls, Resources, I18n) { | ||
], function(_, Q, configs, Class, Logger, Urls, Resources, I18n) { | ||
var logging = Logger.addNamespace("templates"); | ||
@@ -115,2 +116,3 @@ | ||
var that = this; | ||
var d = Q.defer(); | ||
@@ -125,8 +127,12 @@ if (this.view != null) el = el || this.view.$el; | ||
that.trigger("updated"); | ||
d.resolve(el); | ||
}, function(err) { | ||
logging.exception(err, "Error with template:"); | ||
d.reject(err); | ||
}); | ||
}, this); | ||
return this.load(); | ||
this.load(); | ||
return d.promise; | ||
}, | ||
@@ -133,0 +139,0 @@ }, { |
@@ -177,3 +177,2 @@ define([ | ||
if (tpl) return this.renderTemplate(tpl); | ||
return this; | ||
}, | ||
@@ -291,5 +290,3 @@ | ||
}); | ||
tpl.render(); | ||
return this; | ||
return tpl.render(); | ||
} | ||
@@ -296,0 +293,0 @@ }, { |
Sorry, the diff of this file is too big to display
1012844
26327