mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-05 06:37:10 -04:00
Fixed popup not showing
This commit is contained in:
parent
5d0da514f9
commit
ea5073ce13
5 changed files with 23 additions and 23 deletions
|
@ -3188,10 +3188,10 @@ function Ace2Inner(editorInfo, cssManagers) {
|
|||
editorInfo.ace_getInInternationalComposition = () => inInternationalComposition;
|
||||
|
||||
const bindTheEventHandlers = () => {
|
||||
$(document).on('keydown', handleKeyEvent);
|
||||
$(document).on('keypress', handleKeyEvent);
|
||||
$(document).on('keyup', handleKeyEvent);
|
||||
$(document).on('click', handleClick);
|
||||
$(targetDoc).on('keydown', handleKeyEvent);
|
||||
$(targetDoc).on('keypress', handleKeyEvent);
|
||||
$(targetDoc).on('keyup', handleKeyEvent);
|
||||
$(targetDoc).on('click', handleClick);
|
||||
// dropdowns on edit bar need to be closed on clicks on both pad inner and pad outer
|
||||
$(outerDoc).on('click', hideEditBarDropdowns);
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ let pad;
|
|||
|
||||
exports.saveNow = () => {
|
||||
pad.collabClient.sendMessage({type: 'SAVE_REVISION'});
|
||||
$.gritter.add({
|
||||
window.$.gritter.add({
|
||||
// (string | mandatory) the heading of the notification
|
||||
title: html10n.get('pad.savedrevs.marked'),
|
||||
// (string | mandatory) the text inside the notification
|
||||
|
|
|
@ -356,7 +356,6 @@ const padutils = {
|
|||
let globalExceptionHandler = null;
|
||||
padutils.setupGlobalExceptionHandler = () => {
|
||||
if (globalExceptionHandler == null) {
|
||||
require('./vendors/gritter');
|
||||
globalExceptionHandler = (e) => {
|
||||
let type;
|
||||
let err;
|
||||
|
|
6
src/static/js/vendors/gritter.js
vendored
6
src/static/js/vendors/gritter.js
vendored
|
@ -42,8 +42,8 @@
|
|||
return Gritter.add(params || {});
|
||||
} catch(e) {
|
||||
|
||||
var err = 'Gritter Error: ' + e;
|
||||
(typeof(console) != 'undefined' && console.error) ?
|
||||
const err = 'Gritter Error: ' + e;
|
||||
(typeof(console) != 'undefined' && console.error) ?
|
||||
console.error(err, params) :
|
||||
alert(err);
|
||||
|
||||
|
@ -289,7 +289,7 @@
|
|||
*/
|
||||
_runSetup: function(){
|
||||
|
||||
for(opt in $.gritter.options){
|
||||
for(let opt in $.gritter.options){
|
||||
this[opt] = $.gritter.options[opt];
|
||||
}
|
||||
this._is_setup = 1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue