From ebc6d1cc620741c998887d2236e30f737c2e9eb7 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 14 Jun 2017 17:14:35 +0200
Subject: [PATCH] Use lodashLoader's root setting

---
 src/config.js | 76 +++------------------------------------------------
 1 file changed, 4 insertions(+), 72 deletions(-)

diff --git a/src/config.js b/src/config.js
index b5017f332..a1cc0e629 100644
--- a/src/config.js
+++ b/src/config.js
@@ -96,75 +96,6 @@ require.config({
         "zh":        "locale/zh/LC_MESSAGES/converse.json",
 
         "moment_with_locales": "3rdparty/moment_locales",
-
-        // Templates
-        "action":                   "src/templates/action",
-        "add_contact_dropdown":     "src/templates/add_contact_dropdown",
-        "add_contact_form":         "src/templates/add_contact_form",
-        "avatar":                   "src/templates/avatar",
-        "bookmark":                 "src/templates/bookmark",
-        "bookmarks_list":           "src/templates/bookmarks_list",
-        "change_status_message":    "src/templates/change_status_message",
-        "chat_status":              "src/templates/chat_status",
-        "chatarea":                 "src/templates/chatarea",
-        "chatbox":                  "src/templates/chatbox",
-        "chatbox_minimize":         "src/templates/chatbox_minimize",
-        "chatroom":                 "src/templates/chatroom",
-        "chatroom_bookmark_form":   "src/templates/chatroom_bookmark_form",
-        "chatroom_bookmark_toggle": "src/templates/chatroom_bookmark_toggle",
-        "chatroom_disconnect":      "src/templates/chatroom_disconnect",
-        "chatroom_features":        "src/templates/chatroom_features",
-        "chatroom_form":            "src/templates/chatroom_form",
-        "chatroom_head":            "src/templates/chatroom_head",
-        "chatroom_invite":          "src/templates/chatroom_invite",
-        "chatroom_nickname_form":   "src/templates/chatroom_nickname_form",
-        "chatroom_password_form":   "src/templates/chatroom_password_form",
-        "chatroom_sidebar":         "src/templates/chatroom_sidebar",
-        "chatroom_toolbar":         "src/templates/chatroom_toolbar",
-        "chatrooms_tab":            "src/templates/chatrooms_tab",
-        "chats_panel":              "src/templates/chats_panel",
-        "choose_status":            "src/templates/choose_status",
-        "contacts_panel":           "src/templates/contacts_panel",
-        "contacts_tab":             "src/templates/contacts_tab",
-        "controlbox":               "src/templates/controlbox",
-        "controlbox_toggle":        "src/templates/controlbox_toggle",
-        "dragresize":               "src/templates/dragresize",
-        "field":                    "src/templates/field",
-        "form_captcha":             "src/templates/form_captcha",
-        "form_checkbox":            "src/templates/form_checkbox",
-        "form_input":               "src/templates/form_input",
-        "form_select":              "src/templates/form_select",
-        "form_textarea":            "src/templates/form_textarea",
-        "form_username":            "src/templates/form_username",
-        "group_header":             "src/templates/group_header",
-        "help_message":             "src/templates/help_message",
-        "info":                     "src/templates/info",
-        "login_panel":              "src/templates/login_panel",
-        "login_tab":                "src/templates/login_tab",
-        "message":                  "src/templates/message",
-        "new_day":                  "src/templates/new_day",
-        "occupant":                 "src/templates/occupant",
-        "pending_contact":          "src/templates/pending_contact",
-        "register_panel":           "src/templates/register_panel",
-        "register_tab":             "src/templates/register_tab",
-        "registration_form":        "src/templates/registration_form",
-        "registration_request":     "src/templates/registration_request",
-        "requesting_contact":       "src/templates/requesting_contact",
-        "room_description":         "src/templates/room_description",
-        "room_item":                "src/templates/room_item",
-        "room_panel":               "src/templates/room_panel",
-        "rooms_list":               "src/templates/rooms_list",
-        "rooms_list_item":          "src/templates/rooms_list_item",
-        "roster":                   "src/templates/roster",
-        "roster_filter":            "src/templates/roster_filter",
-        "roster_item":              "src/templates/roster_item",
-        "search_contact":           "src/templates/search_contact",
-        "select_option":            "src/templates/select_option",
-        "status_option":            "src/templates/status_option",
-        "toggle_chats":             "src/templates/toggle_chats",
-        "toolbar":                  "src/templates/toolbar",
-        "toolbar_otr":              "src/templates/toolbar_otr",
-        "trimmed_chat":             "src/templates/trimmed_chat"
     },
 
     packages: [{
@@ -198,10 +129,11 @@ require.config({
     lodashLoader: {
         // Configuration for requirejs-tpl
         // Use Mustache style syntax for variable interpolation
+        root: "src/templates/",
         templateSettings: {
-            'escape': /\{\{\{([\s\S]+?)\}\}\}/g,
-            'evaluate': /\{\[([\s\S]+?)\]\}/g,
-            'interpolate': /\{\{([\s\S]+?)\}\}/g
+            "escape": /\{\{\{([\s\S]+?)\}\}\}/g,
+            "evaluate": /\{\[([\s\S]+?)\]\}/g,
+            "interpolate": /\{\{([\s\S]+?)\}\}/g
         }
     },