Auto merge of #61462 - GuillaumeGomez:fix-local-storage, r=Manishearth

bors · bors · commit 71f9384e3bec · 2019-07-12T12:04:25.000Z
[rustdoc] Fix storage usage when disabled Fixes #61239. @starblue: Can you give a try to this change please? I tried on chrome and firefox and both worked so if you're using another web browser, that might be useful. :) r? @Manishearth
diff --git a/src/librustdoc/html/static/storage.js b/src/librustdoc/html/static/storage.js
@@ -64,13 +64,11 @@ function usableLocalStorage() {
     // preferences deny access to localStorage, e.g., to prevent storage of
     // "cookies" (or cookie-likes, as is the case here).
     try {
-        window.localStorage;
+        return window.localStorage !== null && window.localStorage !== undefined;
     } catch(err) {
         // Storage is supported, but browser preferences deny access to it.
         return false;
     }
-
-    return true;
 }
 
 function updateLocalStorage(name, value) {

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,11 @@ function usableLocalStorage() {`
`64`	`64`	`// preferences deny access to localStorage, e.g., to prevent storage of`
`65`	`65`	`// "cookies" (or cookie-likes, as is the case here).`
`66`	`66`	`try {`
`67`		`- window.localStorage;`
	`67`	`+ return window.localStorage !== null && window.localStorage !== undefined;`
`68`	`68`	`} catch(err) {`
`69`	`69`	`// Storage is supported, but browser preferences deny access to it.`
`70`	`70`	`return false;`
`71`	`71`	`}`
`72`		`-`
`73`		`- return true;`
`74`	`72`	`}`
`75`	`73`
`76`	`74`	`function updateLocalStorage(name, value) {`