Centralize unsaved change confirmation.

milanpo · Jun 18, 2018 · aefa89e · aefa89e
1 parent 29d6113
commit aefa89e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/dev/src/RegExr.js b/dev/src/RegExr.js
@@ -117,6 +117,12 @@ export default class RegExr extends EventDispatcher {
 	resetUnsaved() {
 		this._savedHash = this.hash;
 	}
+
+	load(state, warn=true) {
+		if (warn === true) { warn = "You have unsaved changes. Continue without saving?"; }
+		if (warn && this.unsaved && !confirm(warn)) { return; }
+		this.state = Utils.clone(state);
+	}
 
 // private methods:
 	_initUI() {

diff --git a/dev/src/controls/LinkRow.js b/dev/src/controls/LinkRow.js
@@ -54,8 +54,7 @@ export default class LinkRow {
 		if (evt.which === 2 || evt.metaKey || evt.ctrlKey) {
 			window.open(Utils.getPatternURL(this._pattern));
 		} else {
-			if (app.unsaved && !confirm("You have unsaved changes. Load pattern without saving?")) { return; }
-			app.state = Utils.clone(this._pattern);
+			app.load(this._pattern);
 		}
 	}
 };
diff --git a/dev/src/views/Share.js b/dev/src/views/Share.js
@@ -238,8 +238,6 @@ export default class Share extends EventDispatcher {
 				this.nameFld.focus();
 				this.nameFld.select();
 			}
-
-
 			this._linkRow.showMessage("<b>Saved.</b> New share link created. Click to copy to clipboard.");
 		}
 	}
@@ -250,10 +248,7 @@ export default class Share extends EventDispatcher {
 	}
 
 	_doNew() {
-		if (app.unsaved && !confirm("You have unsaved changes. Create new pattern without saving?")) { return; }
-		app.state = {
-			flavor: app.flavor.value
-		}
+		app.load({flavor: app.flavor.value});
 	}
 
 	_doPrivate() {