Merge branch 'infiniteSpinner' into fileManagerMerge

This commit is contained in:
yflory
2016-12-08 16:03:18 +01:00
5 changed files with 19 additions and 3 deletions

View File

@@ -589,6 +589,7 @@ define([
$(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"
Alertify.reset();
if($('#pad-iframe').length) {
var $iframe = $('#pad-iframe');
@@ -875,6 +876,7 @@ define([
var styleAlerts = common.styleAlerts = function (href) {
var $link = $('link[href="/customize/alertify.css"]');
if ($link.length) {
return;
$link.attr('href', '');
$link.attr('href', '/customize/alertify.css');
return;