libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

chat: Move chatHead client var to clientVars hook

Browse source
This commit is contained in:
Richard Hansen 2022-04-08 00:00:38 -04:00
parent 8d5fdd7dc9
commit 2e684476cb
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -96,6 +96,7 @@
* The `sendChatMessageToPadClients()` function in * The `sendChatMessageToPadClients()` function in
`src/node/handler/PadMessageHandler.js` is deprecated. `src/node/handler/PadMessageHandler.js` is deprecated.
* Client-side: * Client-side:
* The `chat` global variable is deprecated.
* The `pad.determineChatVisibility()` method was removed. * The `pad.determineChatVisibility()` method was removed.
* The `pad.determineChatAndUsersVisibility()` method was removed. * The `pad.determineChatAndUsersVisibility()` method was removed.
* Returning `true` from a `handleMessageSecurity` hook function is deprecated; * Returning `true` from a `handleMessageSecurity` hook function is deprecated;

1
src/ep.json
View file

@ -21,6 +21,7 @@
"postAceInit": "ep_etherpad-lite/static/js/chat" "postAceInit": "ep_etherpad-lite/static/js/chat"
}, },
"hooks": { "hooks": {
"clientVars": "ep_etherpad-lite/node/chat",
"eejsBlock_mySettings": "ep_etherpad-lite/node/chat", "eejsBlock_mySettings": "ep_etherpad-lite/node/chat",
"eejsBlock_stickyContainer": "ep_etherpad-lite/node/chat", "eejsBlock_stickyContainer": "ep_etherpad-lite/node/chat",
"handleMessage": "ep_etherpad-lite/node/chat", "handleMessage": "ep_etherpad-lite/node/chat",

2
src/node/chat.js
View file

@ -23,6 +23,8 @@ const sendChatMessageToPadClients = async (message, padId) => {
await promise; await promise;
}; };
exports.clientVars = (hookName, {pad: {chatHead}}) => ({chatHead});
exports.eejsBlock_mySettings = (hookName, context) => { exports.eejsBlock_mySettings = (hookName, context) => {
context.content += ` context.content += `
<p class="hide-for-mobile"> <p class="hide-for-mobile">

3
src/node/handler/PadMessageHandler.js
View file

@ -903,9 +903,6 @@ const handleClientReady = async (socket, message) => {
padShortcutEnabled: settings.padShortcutEnabled, padShortcutEnabled: settings.padShortcutEnabled,
initialTitle: `Pad: ${sessionInfo.auth.padID}`, initialTitle: `Pad: ${sessionInfo.auth.padID}`,
opts: {}, opts: {},
// tell the client the number of the latest chat-message, which will be
// used to request the latest 100 chat-messages later (GET_CHAT_MESSAGES)
chatHead: pad.chatHead,
numConnectedUsers: roomSockets.length, numConnectedUsers: roomSockets.length,
readOnlyId: sessionInfo.readOnlyPadId, readOnlyId: sessionInfo.readOnlyPadId,
readonly: sessionInfo.readonly, readonly: sessionInfo.readonly,

11
src/templates/pad.html
View file

@ -467,9 +467,18 @@
/* TODO: These globals shouldn't exist. */ /* TODO: These globals shouldn't exist. */
pad = require('ep_etherpad-lite/static/js/pad').pad; pad = require('ep_etherpad-lite/static/js/pad').pad;
chat = require('ep_etherpad-lite/static/js/chat').chat;
padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
Object.defineProperty(window, 'chat', {
get: () => {
const {padutils: {warnDeprecated}} = require('ep_etherpad-lite/static/js/pad_utils');
warnDeprecated(
'window.chat is deprecated and will be removed in a future version of Etherpad');
return require('ep_etherpad-lite/static/js/chat').chat;
},
});
require('ep_etherpad-lite/static/js/skin_variants'); require('ep_etherpad-lite/static/js/skin_variants');
}()); }());