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

Update jQuery to 3.7 and fix admintests (#5868)

Browse source 
* jQuery: Migrate to `.on()`, `.off()`, `.trigger()`

This avoids methods that are deprecated in newer versions of jQuery.

* jQuery: avoid `.removeAttr`, prefer `.prop`

* helper.edit: wait up to 10 seconds for ACCEPT_COMMIT

* Chat: disabled attribute is boolean

* Chat: avoid inline onclick handler to support jQuery 3.4+

* jQuery: update to version 3.6.0

* Update to 3.7

* Removed deprecated event.

* Revert change to focus on padeditor.ace

---------

Co-authored-by: webzwo0i <webzwo0i@c3d2.de>
This commit is contained in:
SamTV12345 2023-08-08 18:26:25 +02:00 • committed by GitHub
parent 2f5b6b80e1
commit a096f1ae33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 9457 additions and 8785 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/static/js/vendors/farbtastic.js vendored
View file

@ -33,7 +33,7 @@ $._farbtastic = function (container, options) {
fb.linkTo = function (callback) {
// Unbind previous nodes
if (typeof fb.callback == 'object') {
$(fb.callback).unbind('keyup', fb.updateValue);
$(fb.callback).off('keyup').on('keyup').on('keyup', fb.updateValue);
}
// Reset color
@ -45,7 +45,7 @@ $._farbtastic = function (container, options) {
}
else if (typeof callback == 'object' || typeof callback == 'string') {
fb.callback = $(callback);
fb.callback.bind('keyup', fb.updateValue);
fb.callback.on('keyup', fb.updateValue);
if (fb.callback[0].value) {
fb.setColor(fb.callback[0].value);
}
@ -388,7 +388,7 @@ $._farbtastic = function (container, options) {
fb.mousedown = function (event) {
// Capture mouse
if (!$._farbtastic.dragging) {
$(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup);
$(document).on('mousemove', fb.mousemove).on('mouseup', fb.mouseup);
$._farbtastic.dragging = true;
}
@ -429,8 +429,8 @@ $._farbtastic = function (container, options) {
*/
fb.mouseup = function () {
// Uncapture mouse
$(document).unbind('mousemove', fb.mousemove);
$(document).unbind('mouseup', fb.mouseup);
$(document).off('mousemove').on('mousemove',fb.mousemove);
$(document).off('mouseup').on('mouseup', fb.mouseup);
$._farbtastic.dragging = false;
}
@ -519,7 +519,7 @@ $._farbtastic = function (container, options) {
fb.initWidget();
// Install mousedown handler (the others are set on the document on-demand)
$('canvas.farbtastic-overlay', container).mousedown(fb.mousedown);
$('canvas.farbtastic-overlay', container).on('mousedown',fb.mousedown);
// Set linked elements/callback
if (options.callback) {