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

Merge branch 'develop' of github.com:ether/etherpad-lite into develop

Browse source
This commit is contained in:
John McLear 2020-06-07 12:56:20 +00:00
commit 6fad0210f8
2 changed files with 2645 additions and 3616 deletions
Download patch file Download diff file Expand all files Collapse all files

6249
src/static/js/jquery.js vendored
View file

File diff suppressed because it is too large Load diff

12
src/static/js/pluginfw/client_plugins.js
View file

@ -22,17 +22,17 @@ exports.update = function (cb) {
// of execution on Firefox. This schedules the response in the run-loop, // of execution on Firefox. This schedules the response in the run-loop,
// which appears to fix the issue. // which appears to fix the issue.
var callback = function () {setTimeout(cb, 0);}; var callback = function () {setTimeout(cb, 0);};
$.ajaxSetup({ cache: false });
jQuery.getJSON(exports.baseURL + 'pluginfw/plugin-definitions.json', function(data) { jQuery.getJSON(exports.baseURL + 'pluginfw/plugin-definitions.json').done(function(data) {
exports.plugins = data.plugins; exports.plugins = data.plugins;
exports.parts = data.parts; exports.parts = data.parts;
exports.hooks = pluginUtils.extractHooks(exports.parts, "client_hooks"); exports.hooks = pluginUtils.extractHooks(exports.parts, "client_hooks");
exports.loaded = true; exports.loaded = true;
callback(); callback();
}).error(function(xhr, s, err){ }).fail(function(e){
console.error("Failed to load plugin-definitions: " + err); console.error("Failed to load plugin-definitions: " + err);
callback(); callback();
}); });
}; };
function adoptPlugins(plugins) { function adoptPlugins(plugins) {