mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

socket.io: Delete ignored resource option

Browse source 
I couldn't find any reference to a `resource` option in either the
socket.io-client documentation or its source code.
This commit is contained in:
Richard Hansen 2020-12-10 13:49:22 -05:00
parent 7949219179
commit 7eb0f996c3
4 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/static/js/admin/plugins.js
View file

@ -7,11 +7,10 @@ $(document).ready(() => {
const pathComponents = location.pathname.split('/'); const pathComponents = location.pathname.split('/');
// Strip admin/plugins // Strip admin/plugins
const baseURL = `${pathComponents.slice(0, pathComponents.length - 2).join('/')}/`; const baseURL = `${pathComponents.slice(0, pathComponents.length - 2).join('/')}/`;
const resource = `${baseURL.substring(1)}socket.io`;
// connect // connect
const room = `${url}pluginfw/installer`; const room = `${url}pluginfw/installer`;
const socket = io.connect(room, {path: `${baseURL}socket.io`, resource}); const socket = io.connect(room, {path: `${baseURL}socket.io`});
const search = (searchTerm, limit) => { const search = (searchTerm, limit) => {
if (search.searchTerm !== searchTerm) { if (search.searchTerm !== searchTerm) {

3
src/static/js/admin/settings.js
View file

@ -7,11 +7,10 @@ $(document).ready(() => {
const pathComponents = location.pathname.split('/'); const pathComponents = location.pathname.split('/');
// Strip admin/plugins // Strip admin/plugins
const baseURL = `${pathComponents.slice(0, pathComponents.length - 2).join('/')}/`; const baseURL = `${pathComponents.slice(0, pathComponents.length - 2).join('/')}/`;
const resource = `${baseURL.substring(1)}socket.io`;
// connect // connect
const room = `${url}settings`; const room = `${url}settings`;
const socket = io.connect(room, {path: `${baseURL}socket.io`, resource}); const socket = io.connect(room, {path: `${baseURL}socket.io`});
socket.on('settings', (settings) => { socket.on('settings', (settings) => {
/* Check whether the settings.json is authorized to be viewed */ /* Check whether the settings.json is authorized to be viewed */

3
src/static/js/pad.js
View file

@ -223,13 +223,10 @@ const handshake = () => {
const port = loc.port === '' ? (loc.protocol === 'https:' ? 443 : 80) : loc.port; const port = loc.port === '' ? (loc.protocol === 'https:' ? 443 : 80) : loc.port;
// create the url // create the url
const url = `${loc.protocol}//${loc.hostname}:${port}/`; const url = `${loc.protocol}//${loc.hostname}:${port}/`;
// find out in which subfolder we are
const resource = `${exports.baseURL.substring(1)}socket.io`;
// connect // connect
socket = pad.socket = io.connect(url, { socket = pad.socket = io.connect(url, {
// Allow deployers to host Etherpad on a non-root path // Allow deployers to host Etherpad on a non-root path
path: `${exports.baseURL}socket.io`, path: `${exports.baseURL}socket.io`,
resource,
reconnectionAttempts: 5, reconnectionAttempts: 5,
reconnection: true, reconnection: true,
reconnectionDelay: 1000, reconnectionDelay: 1000,

4
src/static/js/timeslider.js
View file

@ -56,11 +56,9 @@ const init = () => {
const port = loc.port === '' ? (loc.protocol === 'https:' ? 443 : 80) : loc.port; const port = loc.port === '' ? (loc.protocol === 'https:' ? 443 : 80) : loc.port;
// create the url // create the url
const url = `${loc.protocol}//${loc.hostname}:${port}/`; const url = `${loc.protocol}//${loc.hostname}:${port}/`;
// find out in which subfolder we are
const resource = `${exports.baseURL.substring(1)}socket.io`;
// build up the socket io connection // build up the socket io connection
socket = io.connect(url, {path: `${exports.baseURL}socket.io`, resource}); socket = io.connect(url, {path: `${exports.baseURL}socket.io`});
// send the ready message once we're connected // send the ready message once we're connected
socket.on('connect', () => { socket.on('connect', () => {