diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-08 23:43:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-08 23:43:40 +0000 |
| commit | c025c0d58948680c3021a598822c2814f7fe1cce (patch) | |
| tree | c8e59bf3c4a1876509e4643102966f42e54a0bae | |
| parent | cec2be2d763216333551b68d8b6a6b8db9fb7728 (diff) | |
| parent | bf02072a86d4b0d06c246ecbea4f980523983941 (diff) | |
| download | gitlab-ce-c025c0d58948680c3021a598822c2814f7fe1cce.tar.gz | |
Merge branch 'webstorage-exception' into 'master'
Properly handle autosave local storage exceptions.
Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1182.
See merge request !1643
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/autosave.js.coffee | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index b89889664e0..b8f95994213 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,6 +40,7 @@ v 7.8.2 - Fix check if user is allowed to view the file attachment - Fix import check for case sensetive namespaces - Increase timeout for Git-over-HTTP requests to 1 hour since large pulls/pushes can take a long time. + - Properly handle autosave local storage exceptions. v 7.8.1 - Fix run of custom post receive hooks diff --git a/app/assets/javascripts/autosave.js.coffee b/app/assets/javascripts/autosave.js.coffee index 3450f4b55f7..5d3fe81da74 100644 --- a/app/assets/javascripts/autosave.js.coffee +++ b/app/assets/javascripts/autosave.js.coffee @@ -14,7 +14,11 @@ class @Autosave restore: -> return unless window.localStorage? - text = window.localStorage.getItem @key + try + text = window.localStorage.getItem @key + catch + return + @field.val text if text?.length > 0 @field.trigger "input" @@ -23,11 +27,13 @@ class @Autosave text = @field.val() if text?.length > 0 - window.localStorage.setItem @key, text + try + window.localStorage.setItem @key, text else @reset() reset: -> return unless window.localStorage? - window.localStorage.removeItem @key
\ No newline at end of file + try + window.localStorage.removeItem @key |