Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-22 15:33:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4911

Browse Source
This commit is contained in:
barisusakli
2016-08-12 15:29:41 +03:00
parent b9ad7f2dbb
commit 32320018ab
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/src/app.js
View File

@@ -511,20 +511,22 @@ app.cacheBuster = null;
app.parseAndTranslate = function(template, blockName, data, callback) {
require(['translator'], function(translator) {
function translate(html, callback) {
translator.translate(html, function(translatedHTML) {
translatedHTML = translator.unescape(translatedHTML);
callback($(translatedHTML));
});
}
if (typeof blockName === 'string') {
templates.parse(template, blockName, data, function(html) {
translator.translate(html, function(translatedHTML) {
translatedHTML = translator.unescape(translatedHTML);
callback($(translatedHTML));
});
translate(html, callback);
});
} else {
callback = data, data = blockName;
callback = data;
data = blockName;
templates.parse(template, data, function(html) {
translator.translate(html, function(translatedHTML) {
translatedHTML = translator.unescape(translatedHTML);
callback($(translatedHTML));
});
translate(html, callback);
});
}
});

18
public/src/client/topic/fork.js
View File

@@ -1,6 +1,6 @@
'use strict';
/* globals define, app, ajaxify, socket, templates, translator */
/* globals define, app, ajaxify, socket */
define('forum/topic/fork', ['components', 'postSelect'], function(components, postSelect) {
@@ -10,11 +10,17 @@ define('forum/topic/fork', ['components', 'postSelect'], function(components, po
Fork.init = function() {
$('.topic').on('click', '[component="topic/fork"]', onForkThreadClicked);
$(window).on('action:ajaxify.start', onAjaxifyStart);
};
function onAjaxifyStart() {
closeForkModal();
$(window).off('action:ajaxify.start', onAjaxifyStart);
}
function onForkThreadClicked() {
parseModal(function(html) {
forkModal = $(html);
app.parseAndTranslate('partials/fork_thread_modal', {}, function(html) {
forkModal = html;
forkCommit = forkModal.find('#fork_thread_commit');
@@ -33,12 +39,6 @@ define('forum/topic/fork', ['components', 'postSelect'], function(components, po
});
}
function parseModal(callback) {
templates.parse('partials/fork_thread_modal', {}, function(html) {
translator.translate(html, callback);
});
}
function createTopicFromPosts() {
forkCommit.attr('disabled', true);
socket.emit('topics.createTopicFromPosts', {