From c91dfb46f6c07d5173b8f80db1fc6588f1a668b7 Mon Sep 17 00:00:00 2001 From: Peter Jaszkowiak Date: Wed, 30 Aug 2017 11:32:23 -0600 Subject: [PATCH] Switch module t.js usage to Benchpress --- public/src/modules/alerts.js | 4 ++-- public/src/modules/chat.js | 5 +++-- public/src/modules/flags.js | 4 ++-- public/src/modules/helpers.js | 2 -- public/src/modules/iconSelect.js | 4 ++-- public/src/modules/notifications.js | 4 ++-- public/src/modules/pictureCropper.js | 6 +++--- public/src/modules/taskbar.js | 4 ++-- public/src/modules/uploader.js | 4 ++-- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js index 3e55ce1ff1..ccd90eb790 100644 --- a/public/src/modules/alerts.js +++ b/public/src/modules/alerts.js @@ -1,7 +1,7 @@ 'use strict'; -define('alerts', ['translator', 'components'], function (translator, components) { +define('alerts', ['translator', 'components', 'benchpress'], function (translator, components, Benchpress) { var module = {}; module.alert = function (params) { @@ -19,7 +19,7 @@ define('alerts', ['translator', 'components'], function (translator, components) }; function createNew(params) { - templates.parse('alert', params, function (alertTpl) { + Benchpress.parse('alert', params, function (alertTpl) { translator.translate(alertTpl, function (translatedHTML) { var alert = $('#' + params.alert_id); if (alert.length) { diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index d245e5ce23..96b94dbf8b 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -10,7 +10,8 @@ define('chat', [ 'forum/chats/messages', 'translator', 'scrollStop', -], function (components, taskbar, S, sounds, Chats, ChatsMessages, translator, scrollStop) { + 'benchpress', +], function (components, taskbar, S, sounds, Chats, ChatsMessages, translator, scrollStop, Benchpress) { var module = {}; var newMessage = false; @@ -125,7 +126,7 @@ define('chat', [ return room.teaser; }); - templates.parse('partials/chats/dropdown', { + Benchpress.parse('partials/chats/dropdown', { rooms: rooms, }, function (html) { translator.translate(html, function (translated) { diff --git a/public/src/modules/flags.js b/public/src/modules/flags.js index f95953c65e..afd63c6ab2 100644 --- a/public/src/modules/flags.js +++ b/public/src/modules/flags.js @@ -1,7 +1,7 @@ 'use strict'; -define('flags', [], function () { +define('flags', ['benchpress'], function (Benchpress) { var Flag = {}; var flagModal; var flagCommit; @@ -31,7 +31,7 @@ define('flags', [], function () { }; function parseModal(tplData, callback) { - templates.parse('partials/modals/flag_modal', tplData, function (html) { + Benchpress.parse('partials/modals/flag_modal', tplData, function (html) { require(['translator'], function (translator) { translator.translate(html, callback); }); diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js index fbac7da1de..28f853ed60 100644 --- a/public/src/modules/helpers.js +++ b/public/src/modules/helpers.js @@ -8,8 +8,6 @@ define('helpers', ['benchpress', 'string'], function (Benchpress, string) { return factory(utils, Benchpress, string, config.relative_path); }); - } else { - window.helpers = factory(utils, templates, window.String, config.relative_path); } }(function (utils, Benchpress, S, relative_path) { var helpers = { diff --git a/public/src/modules/iconSelect.js b/public/src/modules/iconSelect.js index 96a38e0df6..2b9fcb4865 100644 --- a/public/src/modules/iconSelect.js +++ b/public/src/modules/iconSelect.js @@ -1,7 +1,7 @@ 'use strict'; -define('iconSelect', function () { +define('iconSelect', ['benchpress'], function (Benchpress) { var iconSelect = {}; iconSelect.init = function (el, onModified) { @@ -19,7 +19,7 @@ define('iconSelect', function () { } } - templates.parse('partials/fontawesome', {}, function (html) { + Benchpress.parse('partials/fontawesome', {}, function (html) { html = $(html); html.find('.fa-icons').prepend($('')); diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index f99e1b8de4..a215c19475 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -1,7 +1,7 @@ 'use strict'; -define('notifications', ['sounds', 'translator', 'components', 'navigator'], function (sounds, translator, components, navigator) { +define('notifications', ['sounds', 'translator', 'components', 'navigator', 'benchpress'], function (sounds, translator, components, navigator, Benchpress) { var Notifications = {}; var unreadNotifs = {}; @@ -143,7 +143,7 @@ define('notifications', ['sounds', 'translator', 'components', 'navigator'], fun } translator.toggleTimeagoShorthand(); - templates.parse('partials/notifications_list', { notifications: notifs }, function (html) { + Benchpress.parse('partials/notifications_list', { notifications: notifs }, function (html) { notifList.translateHtml(html); }); }); diff --git a/public/src/modules/pictureCropper.js b/public/src/modules/pictureCropper.js index d413c3d156..3bd8cf1516 100644 --- a/public/src/modules/pictureCropper.js +++ b/public/src/modules/pictureCropper.js @@ -1,7 +1,7 @@ 'use strict'; -define('pictureCropper', ['translator', 'cropper'], function (translator, cropper) { +define('pictureCropper', ['translator', 'cropper', 'benchpress'], function (translator, cropper, Benchpress) { var module = {}; module.show = function (data, callback) { @@ -32,7 +32,7 @@ define('pictureCropper', ['translator', 'cropper'], function (translator, croppe module.handleImageCrop = function (data, callback) { $('#crop-picture-modal').remove(); - templates.parse('modals/crop_picture', { + Benchpress.parse('modals/crop_picture', { url: data.url, }, function (cropperHtml) { translator.translate(cropperHtml, function (translated) { @@ -179,7 +179,7 @@ define('pictureCropper', ['translator', 'cropper'], function (translator, croppe } function parseModal(tplVals, callback) { - templates.parse('partials/modals/upload_file_modal', tplVals, function (html) { + Benchpress.parse('partials/modals/upload_file_modal', tplVals, function (html) { translator.translate(html, callback); }); } diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js index 49c57c5aa1..15769ced56 100644 --- a/public/src/modules/taskbar.js +++ b/public/src/modules/taskbar.js @@ -1,13 +1,13 @@ 'use strict'; -define('taskbar', function () { +define('taskbar', ['benchpress'], function (Benchpress) { var taskbar = {}; taskbar.init = function () { var self = this; - templates.parse('modules/taskbar', {}, function (html) { + Benchpress.parse('modules/taskbar', {}, function (html) { self.taskbar = $(html); self.tasklist = self.taskbar.find('ul'); $(document.body).append(self.taskbar); diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js index aca2460ee5..6fd4a09336 100644 --- a/public/src/modules/uploader.js +++ b/public/src/modules/uploader.js @@ -1,7 +1,7 @@ 'use strict'; -define('uploader', ['translator'], function (translator) { +define('uploader', ['translator', 'benchpress'], function (translator, Benchpress) { var module = {}; module.open = function (route, params, fileSize, callback) { @@ -102,7 +102,7 @@ define('uploader', ['translator'], function (translator) { } function parseModal(tplVals, callback) { - templates.parse('partials/modals/upload_file_modal', tplVals, function (html) { + Benchpress.parse('partials/modals/upload_file_modal', tplVals, function (html) { translator.translate(html, callback); }); }