ajaxify t.js usage to Benchpress

v1.18.x
Peter Jaszkowiak 8 years ago
parent 5885e37127
commit dc3f89a505

@ -10,13 +10,15 @@ $(document).ready(function () {
var ajaxifyTimer; var ajaxifyTimer;
var translator; var translator;
var Benchpress;
var retry = true; var retry = true;
var previousBodyClass = ''; var previousBodyClass = '';
// Dumb hack to fool ajaxify into thinking translator is still a global // Dumb hack to fool ajaxify into thinking translator is still a global
// When ajaxify is migrated to a require.js module, then this can be merged into the "define" call // When ajaxify is migrated to a require.js module, then this can be merged into the "define" call
require(['translator'], function (_translator) { require(['translator', 'benchpress'], function (_translator, _Benchpress) {
translator = _translator; translator = _translator;
Benchpress = _Benchpress;
}); });
$(window).on('popstate', function (ev) { $(window).on('popstate', function (ev) {
@ -174,7 +176,7 @@ $(document).ready(function () {
function renderTemplate(url, tpl_url, data, callback) { function renderTemplate(url, tpl_url, data, callback) {
$(window).trigger('action:ajaxify.loadingTemplates', {}); $(window).trigger('action:ajaxify.loadingTemplates', {});
templates.parse(tpl_url, data, function (template) { Benchpress.parse(tpl_url, data, function (template) {
translator.translate(template, function (translatedTemplate) { translator.translate(template, function (translatedTemplate) {
translatedTemplate = translator.unescape(translatedTemplate); translatedTemplate = translator.unescape(translatedTemplate);
$('body').removeClass(previousBodyClass).addClass(data.bodyClass); $('body').removeClass(previousBodyClass).addClass(data.bodyClass);

@ -624,7 +624,7 @@ app.cacheBuster = null;
}; };
app.parseAndTranslate = function (template, blockName, data, callback) { app.parseAndTranslate = function (template, blockName, data, callback) {
require(['translator'], function (translator) { require(['translator', 'benchpress'], function (translator, Benchpress) {
function translate(html, callback) { function translate(html, callback) {
translator.translate(html, function (translatedHTML) { translator.translate(html, function (translatedHTML) {
translatedHTML = translator.unescape(translatedHTML); translatedHTML = translator.unescape(translatedHTML);
@ -633,13 +633,13 @@ app.cacheBuster = null;
} }
if (typeof blockName === 'string') { if (typeof blockName === 'string') {
templates.parse(template, blockName, data, function (html) { Benchpress.parse(template, blockName, data, function (html) {
translate(html, callback); translate(html, callback);
}); });
} else { } else {
callback = data; callback = data;
data = blockName; data = blockName;
templates.parse(template, data, function (html) { Benchpress.parse(template, data, function (html) {
translate(html, callback); translate(html, callback);
}); });
} }

Loading…
Cancel
Save