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

This commit is contained in:
yflory 2017-06-13 11:38:16 +02:00
commit 4eeea93265
2 changed files with 12 additions and 1 deletions

View File

@ -20,5 +20,16 @@ define([], function () {
}; };
} }
if (!localStorage || typeof(localStorage.getItem) !== 'function') {
require('jquery', function ($) {
$.ajax({
type: 'HEAD',
url: '/common/feedback.html?NO_LOCALSTORAGE=' + (+new Date()),
});
});
window.alert("CryptPad needs localStorage to work, try a different browser");
return;
}
require([document.querySelector('script[data-bootload]').getAttribute('data-bootload')]); require([document.querySelector('script[data-bootload]').getAttribute('data-bootload')]);
}); });

View File

@ -2689,7 +2689,7 @@ define([
if (err) { return void logError(err); } if (err) { return void logError(err); }
$leftside.html(''); $leftside.html('');
$leftside.append($limitContainer); $leftside.append($limitContainer);
}); }, true);
/* add a history button */ /* add a history button */
var histConfig = { var histConfig = {