MDL-54687 core_message: reduce amount of JS in templates

moodle · Oct 7, 2016 · ed6a141 · ed6a141
1 parent 8c55bd6
commit ed6a141
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/message/amd/src/message_area.js b/message/amd/src/message_area.js
@@ -21,9 +21,10 @@
  * @copyright  2016 Mark Nelson <markn@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define(['jquery', 'core_message/message_area_actions', 'core_message/message_area_contacts',
-        'core_message/message_area_messages', 'core_message/message_area_profile', 'core_message/message_area_tabs'],
-    function($, Actions, Contacts, Messages, Profile, Tabs) {
+define(['jquery', 'core_message/message_area_contacts', 'core_message/message_area_messages',
+        'core_message/message_area_profile', 'core_message/message_area_menubar', 'core_message/message_area_tabs',
+        'core_message/message_area_actions'],
+    function($, Contacts, Messages, Profile, Menubar, Tabs, Actions) {
 
         /**
          * Messagearea class.
@@ -47,6 +48,7 @@ define(['jquery', 'core_message/message_area_actions', 'core_message/message_are
             DELETEMESSAGECHECKBOX: "[data-region='delete-message-checkbox']",
             LASTMESSAGE: '.lastmessage',
             LOADINGICON: '.loading-icon',
+            MENU: "[data-region='menu']",
             MESSAGE: "[data-region='message']",
             MESSAGES: "[data-region='messages']",
             MESSAGESAREA: "[data-region='messages-area']",
@@ -96,6 +98,11 @@ define(['jquery', 'core_message/message_area_actions', 'core_message/message_are
             new Messages(this);
             new Profile(this);
             new Tabs(this);
+            var actions = new Actions(this);
+
+            Menubar.enhance(this.find(this.SELECTORS.MENU), {
+                "[data-action='delete-messages']": actions.chooseMessagesToDelete.bind(actions)
+            });
         };
 
         /**

diff --git a/message/templates/message_area.mustache b/message/templates/message_area.mustache
@@ -1,6 +1,6 @@
 <div class="messaging-area-all" data-loggedinuserid="{{loggedinuserid}}" data-userid="{{userid}}">
     <div class="actions">
-        <ul title="{{#str}}edit{{/str}}" class="messagingareaactions">
+        <ul title="{{#str}}edit{{/str}}" data-region="menu">
             <li>
                 <a href="#">{{#pix}}i/settings{{/pix}}</a>
                 <ul class="dropdown-menu">
@@ -29,14 +29,9 @@
     </div>
 </div>
 {{#js}}
-    require(['core_message/message_area', 'core_message/message_area_menubar', 'core_message/message_area_actions'],
-        function(Messagearea, Menubar, Actions) {
-            var messageArea = new Messagearea('.messaging-area-all');
-            var actions = new Actions(messageArea);
-
-            Menubar.enhance('.messagingareaactions', {
-                "[data-action='delete-messages']": actions.chooseMessagesToDelete.bind(actions),
-            });
+    require(['core_message/message_area'],
+        function(Messagearea) {
+            new Messagearea('.messaging-area-all');
         }
     );
 {{/js}}