scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored template loading

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-10-05 10:41:12 +02:00
parent 688b5b1281
commit 784ff22050
18 changed files with 107 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public_html/js/Util.js
View File

@ -2,7 +2,6 @@ var App = App || {};
App.Util = function(_, jQuery, promise) {
var templateCache = {};
var exitConfirmationEnabled = false;
function transparentPixel() {
@ -51,25 +50,15 @@ App.Util = function(_, jQuery, promise) {
}
function promiseTemplate(templateName) {
return promiseTemplateFromCache(templateName) ||
promiseTemplateFromDOM(templateName) ||
return promiseTemplateFromDOM(templateName) ||
promiseTemplateWithAJAX(templateName);
}
function promiseTemplateFromCache(templateName) {
if (templateName in templateCache) {
return promise.make(function(resolve, reject) {
resolve(templateCache[templateName]);
});
}
return null;
}
function promiseTemplateFromDOM(templateName) {
var $template = jQuery('#' + templateName + '-template');
if ($template.length) {
return promise.make(function(resolve, reject) {
resolve($template.html());
resolve(_.template($template.html()));
});
}
return null;
@ -84,7 +73,7 @@ App.Util = function(_, jQuery, promise) {
url: templateUrl,
method: 'GET',
success: function(data, textStatus, xhr) {
resolve(data);
resolve(_.template(data));
},
error: function(xhr, textStatus, errorThrown) {
console.log(new Error('Error while loading template ' + templateName + ': ' + errorThrown));