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

2017-06-13 11:38:16 +02:00
parent 11e2226f1a c779e328e8
commit 4eeea93265
2 changed files with 12 additions and 1 deletions
--- a/www/common/boot2.js
+++ b/www/common/boot2.js
@@ -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')]);
 });