From dbcb6f97964589e856bf9e7bc6fcbf57418860ef Mon Sep 17 00:00:00 2001 From: Manuel Valle Date: Wed, 20 Jan 2016 10:02:34 -0600 Subject: [PATCH 1/4] Update events.js Same problem as [#4069](https://github.com/NodeBB/NodeBB/pull/4069). Added a **translator** variable refering to **translator** module instead of global *translator*. This solves warnings editing posts with *composer*. --- public/src/client/topic/events.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index ba6313c4b4..c7c2c6e270 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -130,10 +130,12 @@ define('forum/topic/events', [ }; templates.parse('partials/topic/post-editor', editData, function(html) { - translator.translate(html, function(translated) { - html = $(translated); - editorEl.replaceWith(html); - html.find('.timeago').timeago(); + require(['translator'], function(translator) { + translator.translate(html, function(translated) { + html = $(translated); + editorEl.replaceWith(html); + html.find('.timeago').timeago(); + }); }); }); From c9c761d70bbfbb1d07ab3789a4bd70f628e1c418 Mon Sep 17 00:00:00 2001 From: Manuel Valle Date: Wed, 20 Jan 2016 11:33:23 -0600 Subject: [PATCH 2/4] Update events.js This optimize previous commit. See [#4078](https://github.com/NodeBB/NodeBB/pull/4078). Added ```translator``` module instead of global ```translator```. This solves warnings editing posts with *composer*. --- public/src/client/topic/events.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index c7c2c6e270..f5a9bbd0dc 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -1,14 +1,15 @@ 'use strict'; -/* globals config, app, ajaxify, define, socket, templates, translator, utils */ +/* globals config, app, ajaxify, define, socket, templates, utils */ define('forum/topic/events', [ - 'forum/topic/postTools', - 'forum/topic/threadTools', - 'forum/topic/posts', - 'components' -], function(postTools, threadTools, posts, components) { + 'forum/topic/postTools', + 'forum/topic/threadTools', + 'forum/topic/posts', + 'components', + 'translator' +], function(postTools, threadTools, posts, components, translator) { var Events = {}; From 67d9323b9e72e40cd632a96781b32fe9115c7a39 Mon Sep 17 00:00:00 2001 From: Manuel Valle Date: Wed, 20 Jan 2016 11:34:33 -0600 Subject: [PATCH 3/4] Update events.js --- public/src/client/topic/events.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index f5a9bbd0dc..99d2c85aa5 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -131,12 +131,10 @@ define('forum/topic/events', [ }; templates.parse('partials/topic/post-editor', editData, function(html) { - require(['translator'], function(translator) { - translator.translate(html, function(translated) { - html = $(translated); - editorEl.replaceWith(html); - html.find('.timeago').timeago(); - }); + translator.translate(html, function(translated) { + html = $(translated); + editorEl.replaceWith(html); + html.find('.timeago').timeago(); }); }); From 4c43276fce681225505b5ed6d8c1ae5696c8ea4e Mon Sep 17 00:00:00 2001 From: Manuel Valle Date: Wed, 20 Jan 2016 13:55:38 -0600 Subject: [PATCH 4/4] Update events.js Tebbed indentation. --- public/src/client/topic/events.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js index 99d2c85aa5..21ad1958c3 100644 --- a/public/src/client/topic/events.js +++ b/public/src/client/topic/events.js @@ -4,11 +4,11 @@ /* globals config, app, ajaxify, define, socket, templates, utils */ define('forum/topic/events', [ - 'forum/topic/postTools', - 'forum/topic/threadTools', - 'forum/topic/posts', - 'components', - 'translator' + 'forum/topic/postTools', + 'forum/topic/threadTools', + 'forum/topic/posts', + 'components', + 'translator' ], function(postTools, threadTools, posts, components, translator) { var Events = {};