summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-08 23:43:40 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-08 23:43:40 +0000
commitc025c0d58948680c3021a598822c2814f7fe1cce (patch)
treec8e59bf3c4a1876509e4643102966f42e54a0bae /app/assets
parentcec2be2d763216333551b68d8b6a6b8db9fb7728 (diff)
parentbf02072a86d4b0d06c246ecbea4f980523983941 (diff)
downloadgitlab-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
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/autosave.js.coffee12
1 files changed, 9 insertions, 3 deletions
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