Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
yflory
2017-04-25 17:22:07 +02:00
12 changed files with 74 additions and 17 deletions

View File

@@ -1189,6 +1189,11 @@ define([
if (typeof(window.Proxy) === 'undefined') {
feedback("NO_PROXIES");
}
if (typeof(Array.isArray) === 'function') {
feedback("NO_ISARRAY");
}
$(function() {
// Race condition : if document.body is undefined when alertify.js is loaded, Alertify
// won't work. We have to reset it now to make sure it uses a correct "body"