Merge branch 'master' into development

WesCossick · WesCossick · commit a98665a0a706 · 2015-11-03T14:58:30.000-06:00
diff --git a/src/js/simplemde.js b/src/js/simplemde.js
@@ -1008,7 +1008,7 @@ SimpleMDE.prototype.autosave = function() {
 	}
 
 	if(this.options.autosave.loaded !== true) {
-		if(localStorage.getItem(this.options.autosave.unique_id) != null)
+		if(typeof localStorage.getItem(this.options.autosave.unique_id) == "string" && localStorage.getItem(this.options.autosave.unique_id) != "")
 			this.codemirror.setValue(localStorage.getItem(this.options.autosave.unique_id));
 
 		this.options.autosave.loaded = true;

Original file line number	Diff line number	Diff line change
`@@ -1008,7 +1008,7 @@ SimpleMDE.prototype.autosave = function() {`
`1008`	`1008`	`}`
`1009`	`1009`
`1010`	`1010`	`if(this.options.autosave.loaded !== true) {`
`1011`		`- if(localStorage.getItem(this.options.autosave.unique_id) != null)`
	`1011`	`+ if(typeof localStorage.getItem(this.options.autosave.unique_id) == "string" && localStorage.getItem(this.options.autosave.unique_id) != "")`
`1012`	`1012`	`this.codemirror.setValue(localStorage.getItem(this.options.autosave.unique_id));`
`1013`	`1013`
`1014`	`1014`	`this.options.autosave.loaded = true;`