mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 01:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

pad_userlist: Don't rely on global pad variable

Browse source
This commit is contained in:
Richard Hansen 2021-08-13 23:44:02 -04:00
parent bf6ab3bba8
commit e99eb6366c
1 changed files with 62 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/static/js/pad_userlist.js
View file

@ -369,18 +369,13 @@ const paduserlist = (() => {
}); });
// color picker // color picker
$('#myswatchbox').click(showColorPicker); $('#myswatchbox').click(() => self.showColorPicker());
$('#mycolorpicker .pickerswatchouter').click(function () { $('#mycolorpicker .pickerswatchouter').click(function () {
$('#mycolorpicker .pickerswatchouter').removeClass('picked'); $('#mycolorpicker .pickerswatchouter').removeClass('picked');
$(this).addClass('picked'); $(this).addClass('picked');
}); });
$('#mycolorpickersave').click(() => { $('#mycolorpickersave').click(() => self.closeColorPicker(true));
closeColorPicker(true); $('#mycolorpickercancel').click(() => self.closeColorPicker(false));
});
$('#mycolorpickercancel').click(() => {
closeColorPicker(false);
});
//
}, },
usersOnline: () => { usersOnline: () => {
// Returns an object of users who are currently online on this pad // Returns an object of users who are currently online on this pad
@ -541,13 +536,8 @@ const paduserlist = (() => {
$('#myswatch').css({'background-color': myUserInfo.colorId}); $('#myswatch').css({'background-color': myUserInfo.colorId});
$('li[data-key=showusers] > a').css({'box-shadow': `inset 0 0 30px ${myUserInfo.colorId}`}); $('li[data-key=showusers] > a').css({'box-shadow': `inset 0 0 30px ${myUserInfo.colorId}`});
}, },
};
return self;
})();
const getColorPickerSwatchIndex = (jnode) => $('#colorpickerswatches li').index(jnode); closeColorPicker: (accept) => {
const closeColorPicker = (accept) => {
if (accept) { if (accept) {
let newColor = $('#mycolorpickerpreview').css('background-color'); let newColor = $('#mycolorpickerpreview').css('background-color');
const parts = newColor.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/); const parts = newColor.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
@ -567,9 +557,9 @@ const closeColorPicker = (accept) => {
colorPickerOpen = false; colorPickerOpen = false;
$('#mycolorpicker').removeClass('popup-show'); $('#mycolorpicker').removeClass('popup-show');
}; },
const showColorPicker = () => { showColorPicker: () => {
$.farbtastic('#colorpicker').setColor(myUserInfo.colorId); $.farbtastic('#colorpicker').setColor(myUserInfo.colorId);
if (!colorPickerOpen) { if (!colorPickerOpen) {
@ -602,6 +592,11 @@ const showColorPicker = () => {
$('#colorpickerswatches li').removeClass('picked'); $('#colorpickerswatches li').removeClass('picked');
$($('#colorpickerswatches li')[myUserInfo.colorId]).addClass('picked'); // seems weird $($('#colorpickerswatches li')[myUserInfo.colorId]).addClass('picked'); // seems weird
} }
},
getColorPickerSwatchIndex: (jnode) => $('#colorpickerswatches li').index(jnode),
}; };
return self;
})();
exports.paduserlist = paduserlist; exports.paduserlist = paduserlist;