Merge "Prevent JSON parsing errors"

2014-02-11 08:27:23 +00:00
parent 2059501b04 7627358fb4
commit 10580dbbdf
1 changed files with 8 additions and 1 deletions
--- a/resources/js/ext.uls.preferences.js
+++ b/resources/js/ext.uls.preferences.js
@@ -180,8 +180,15 @@
 				this.preferences = preferenceStore().get( this.preferenceName );
 			} else {
 				var options = mw.user.options.get( this.preferenceName );
-				this.preferences = JSON.parse( options );
+
+				// Try to parse JSON
+				try {
+					this.preferences = JSON.parse( options );
+				} catch ( e ) {
+					this.preferences = {};
+				}
 			}
+
 			this.preferences = this.preferences || {};
 		},