mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-08-16 19:41:45 +02:00
Rebase onto Master
This commit is contained in:
@ -357,7 +357,7 @@
|
||||
this.loading_prompt('connectionLost', true, '', null);
|
||||
}, egw(window));
|
||||
window.Offline.on('up', function(){
|
||||
jQuery('#egw_message').click()
|
||||
jQuery('#egw_message').click();
|
||||
this.loading_prompt('connectionLost', false);
|
||||
}, egw(window));
|
||||
}
|
||||
@ -417,7 +417,6 @@
|
||||
egw_script.getAttribute('data-websocket-url'),
|
||||
JSON.parse(egw_script.getAttribute('data-websocket-tokens'))
|
||||
);
|
||||
egw.set_grants(JSON.parse(egw_script.getAttribute('data-grants') || "{}"));
|
||||
}
|
||||
}
|
||||
catch(e) {
|
||||
@ -441,6 +440,7 @@
|
||||
// get TypeScript modules working with our loader
|
||||
function require(_file)
|
||||
{
|
||||
|
||||
return window.exports;
|
||||
}
|
||||
var exports = {};
|
||||
|
Reference in New Issue
Block a user