From d5583559c042e1a2a6e71da8c43daba59137cf2f Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sat, 14 Aug 2021 00:54:16 -0400
Subject: [PATCH] Chat: Move `onClick` attributes to `chat.js`

This avoids the reliance on the global `chat` variable, and it is a
step toward supporting a strict Content Security Policy (#4401).
---
 src/static/js/chat.js  |  5 +++++
 src/templates/pad.html | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 63c17c153..4082c7c19 100755
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -218,6 +218,11 @@ exports.chat = (() => {
     },
     init(pad) {
       this._pad = pad;
+      $('#options-stickychat').on('click', () => this.stickToScreen());
+      $('#options-chatandusers').on('click', () => this.chatAndUsers());
+      $('#chaticon').on('click', (e) => { e.preventDefault(); this.show(); });
+      $('#titlecross').on('click', (e) => { e.preventDefault(); this.hide(); });
+      $('#titlesticky').on('click', (e) => { e.preventDefault(); this.stickToScreen(true); });
       $('#chatinput').on('keydown', (evt) => {
         // If the event is Alt C or Escape & we're already in the chat menu
         // Send the users focus back to the pad
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 84dc3d668..ebad29645 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -122,11 +122,11 @@
           <% e.begin_block("mySettings"); %>
           <h2 data-l10n-id="pad.settings.myView"></h2>
           <p class="hide-for-mobile">
-              <input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();">
+              <input type="checkbox" id="options-stickychat">
               <label for="options-stickychat" data-l10n-id="pad.settings.stickychat"></label>
           </p>
           <p class="hide-for-mobile">
-              <input type="checkbox" id="options-chatandusers" onClick="chat.chatAndUsers();">
+              <input type="checkbox" id="options-chatandusers">
               <label for="options-chatandusers" data-l10n-id="pad.settings.chatandusers"></label>
           </p>
           <p>
@@ -368,7 +368,7 @@
         <!----------- CHAT ------------>
         <!----------------------------->
 
-        <div id="chaticon" class="visible" onclick="chat.show();return false;" title="Chat (Alt C)">
+        <div id="chaticon" class="visible" title="Chat (Alt C)">
             <span id="chatlabel" data-l10n-id="pad.chat"></span>
             <span class="buttonicon buttonicon-chat"></span>
             <span id="chatcounter">0</span>
@@ -378,8 +378,8 @@
           <div class="chat-content">
             <div id="titlebar">
               <h1 id ="titlelabel" data-l10n-id="pad.chat"></h1>
-              <a id="titlecross" class="hide-reduce-btn" onClick="chat.hide();return false;">-&nbsp;</a>
-              <a id="titlesticky" class="stick-to-screen-btn" onClick="chat.stickToScreen(true);return false;" data-l10n-id="pad.chat.stick.title">█&nbsp;&nbsp;</a>
+              <a id="titlecross" class="hide-reduce-btn">-&nbsp;</a>
+              <a id="titlesticky" class="stick-to-screen-btn" data-l10n-id="pad.chat.stick.title">█&nbsp;&nbsp;</a>
             </div>
             <div id="chattext" class="thin-scrollbar" aria-live="polite" aria-relevant="additions removals text" role="log" aria-atomic="false">
                 <div alt="loading.." id="chatloadmessagesball" class="chatloadmessages loadingAnimation" align="top"></div>