From a2cc41f96bf66b56d988db9ddf86cc91bf268d0d Mon Sep 17 00:00:00 2001
From: troybevosus <troyb@evosus.com>
Date: Tue, 3 Jul 2018 12:09:41 -0700
Subject: [PATCH 1/2] if modal is open a CLOSE_MODAL observable will be
 triggered on 'before-mount'

---
 client/system/tags/ui-modal.tag.html | 32 ++++++++++++++++++++++++++--
 package.json                         |  3 ++-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/client/system/tags/ui-modal.tag.html b/client/system/tags/ui-modal.tag.html
index a017033..07ef927 100644
--- a/client/system/tags/ui-modal.tag.html
+++ b/client/system/tags/ui-modal.tag.html
@@ -1,5 +1,5 @@
 <ui-modal>
-	<div if="{ opts.isOpen }" class="ui-modal f-col ai-center jc-center fill">
+	<div if="{ opts.isOpen && opts.template }" class="ui-modal f-col ai-center jc-center fill">
 		<div class="ui-white rounded modal-shadow">
 			<div class="modal-contents">
 				<div id="modalMount">
@@ -31,9 +31,37 @@
 	<script>
 		this.mixin(IO.default);
 		this.on('update',() => {
-			if(this.opts.template) {
+			console.log('update', this.opts);
+			
+			if(this.opts.template && this.opts.templateOpts) {
 				riot.mount('#modalMount',this.opts.template,this.opts.templateOpts || {});	
 			}
 		});
+		// this.on('updated',() => {
+		// 	console.log(this.opts)
+		// 	if (this.opts.isOpen) {
+		// 		console.log('isOpen', this.opts.templateOpts)
+		// 		// console.log()
+		// 	}			
+		// })
+		this.on('before-mount', (e) => {
+			let navState = IO.default.getStateByKey('NAV')
+			if (navState.ui_modal.isOpen) {
+				console.log('modal is open')
+				IO.default.obs.trigger('CLOSE_MODAL')
+				this.update()
+			}
+		})
+		// this.on('mount', () => {
+			// IO.default.obs.trigger('CLOSE_MODAL');
+			// if (this.opts) {
+			// 	console.log('mount', this.opts)
+			// 	// IO.default.obs.trigger('CLOSE_MODAL')
+			// }
+			// try {
+			// } catch (e) {
+			// 	console.log('before-mount', this.opts)
+			// }
+		// })
 	</script>
 </ui-modal>
diff --git a/package.json b/package.json
index ee74635..da08805 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
     "start": "node ./server.js",
     "devstart": "NODE_ENV=development nodemon ./server.js",
     "wds": "node_modules/.bin/webpack-dev-server",
-    "monitor": "nodemon ./server.js"
+    "monitor": "nodemon ./server.js",
+    "build": "webpack -w"
   },
   "repository": {
     "type": "git",

From 58d8816140b624076cac25edbd7c08bcffc83e62 Mon Sep 17 00:00:00 2001
From: troybevosus <troyb@evosus.com>
Date: Tue, 3 Jul 2018 13:24:28 -0700
Subject: [PATCH 2/2] cleaned up code

---
 client/system/tags/ui-modal.tag.html | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/client/system/tags/ui-modal.tag.html b/client/system/tags/ui-modal.tag.html
index 07ef927..5242669 100644
--- a/client/system/tags/ui-modal.tag.html
+++ b/client/system/tags/ui-modal.tag.html
@@ -1,5 +1,5 @@
 <ui-modal>
-	<div if="{ opts.isOpen && opts.template }" class="ui-modal f-col ai-center jc-center fill">
+	<div if="{ opts.isOpen }" class="ui-modal f-col ai-center jc-center fill">
 		<div class="ui-white rounded modal-shadow">
 			<div class="modal-contents">
 				<div id="modalMount">
@@ -31,37 +31,15 @@
 	<script>
 		this.mixin(IO.default);
 		this.on('update',() => {
-			console.log('update', this.opts);
-			
 			if(this.opts.template && this.opts.templateOpts) {
 				riot.mount('#modalMount',this.opts.template,this.opts.templateOpts || {});	
 			}
 		});
-		// this.on('updated',() => {
-		// 	console.log(this.opts)
-		// 	if (this.opts.isOpen) {
-		// 		console.log('isOpen', this.opts.templateOpts)
-		// 		// console.log()
-		// 	}			
-		// })
 		this.on('before-mount', (e) => {
 			let navState = IO.default.getStateByKey('NAV')
 			if (navState.ui_modal.isOpen) {
-				console.log('modal is open')
 				IO.default.obs.trigger('CLOSE_MODAL')
-				this.update()
 			}
 		})
-		// this.on('mount', () => {
-			// IO.default.obs.trigger('CLOSE_MODAL');
-			// if (this.opts) {
-			// 	console.log('mount', this.opts)
-			// 	// IO.default.obs.trigger('CLOSE_MODAL')
-			// }
-			// try {
-			// } catch (e) {
-			// 	console.log('before-mount', this.opts)
-			// }
-		// })
 	</script>
 </ui-modal>