Fixed bug, when remove route, not remove triggers.

gunins · Jul 3, 2017 · 880d7f8 · 880d7f8
1 parent 27d21ee
commit 880d7f8
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 20 deletions.
diff --git a/dist/docs/setRoutes.html b/dist/docs/setRoutes.html
@@ -165,7 +165,8 @@ <h1>setRoutes.js</h1>
                     active = context.active,
                     matches = match(route),
                     oldParams = context.oldParams = context.oldParams || <span class="hljs-literal">false</span>,
-                    routesQueried = context.routesQueried = context.routesQueried || [];
+                    routesQueried = context.routesQueried = context.routesQueried || [],
+                    childMatch = <span class="hljs-keyword">new</span> <span class="hljs-built_in">Map</span>();
 
                 matches.to(<span class="hljs-function">(<span class="hljs-params">...args</span>) =&gt;</span> {
                     <span class="hljs-keyword">let</span> params = args.pop();
@@ -189,10 +190,10 @@ <h1>setRoutes.js</h1>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre>                                match(route, match =&gt; matchRoute(instance, <span class="hljs-built_in">Object</span>.assign({}, context, {
+            <div class="content"><div class='highlight'><pre>                                childMatch.set(instance, match(route, match =&gt; matchRoute(instance, <span class="hljs-built_in">Object</span>.assign({}, context, {
                                     match,
                                     active
-                                })));
+                                }))));
                             }
                         });
                     }
@@ -214,6 +215,13 @@ <h1>setRoutes.js</h1>
                                 <span class="hljs-keyword">if</span> (!id) {
                                     dom.detach(childInstance);
                                 } <span class="hljs-keyword">else</span> {
+                                    applyToChildren(childInstance.children, instance =&gt; {
+                                        <span class="hljs-keyword">const</span> childRoute = childMatch.get(instance);
+                                        <span class="hljs-keyword">if</span> (childRoute) {
+                                            childRoute.remove();
+                                            childMatch.delete(instance);
+                                        }
+                                    });
                                     destroyComponent(childInstance);
                                 }
                             },

diff --git a/dist/es5/dev/widget/Constructor.js b/dist/es5/dev/widget/Constructor.js
diff --git a/dist/es5/dev/widget/Constructor.js.map b/dist/es5/dev/widget/Constructor.js.map
diff --git a/dist/es5/prod/babel/polyfill.js b/dist/es5/prod/babel/polyfill.js
diff --git a/dist/es5/prod/widget/App.js b/dist/es5/prod/widget/App.js
diff --git a/dist/es6/dev/widget/Constructor.js b/dist/es6/dev/widget/Constructor.js
@@ -998,7 +998,8 @@ define('widget/parsers/setRoutes',[
                     active = context.active,
                     matches = match(route),
                     oldParams = context.oldParams = context.oldParams || false,
-                    routesQueried = context.routesQueried = context.routesQueried || [];
+                    routesQueried = context.routesQueried = context.routesQueried || [],
+                    childMatch = new Map();
 
                 matches.to((...args) => {
                     let params = args.pop();
@@ -1009,10 +1010,10 @@ define('widget/parsers/setRoutes',[
                         applyToChildren(childInstance.children, instance => {
                             if (instance) {
                                 //TODO: maybe not need Object.assign
-                                match(route, match => matchRoute(instance, Object.assign({}, context, {
+                                childMatch.set(instance, match(route, match => matchRoute(instance, Object.assign({}, context, {
                                     match,
                                     active
-                                })));
+                                }))));
                             }
                         });
                     }
@@ -1034,6 +1035,13 @@ define('widget/parsers/setRoutes',[
                                 if (!id) {
                                     dom.detach(childInstance);
                                 } else {
+                                    applyToChildren(childInstance.children, instance => {
+                                        const childRoute = childMatch.get(instance);
+                                        if (childRoute) {
+                                            childRoute.remove();
+                                            childMatch.delete(instance);
+                                        }
+                                    });
                                     destroyComponent(childInstance);
                                 }
                             },

diff --git a/dist/es6/prod/widget/App.js b/dist/es6/prod/widget/App.js
diff --git a/dist/loader.js b/dist/loader.js
diff --git a/src/widget/parsers/setRoutes.js b/src/widget/parsers/setRoutes.js
@@ -55,7 +55,8 @@ define([
                     active = context.active,
                     matches = match(route),
                     oldParams = context.oldParams = context.oldParams || false,
-                    routesQueried = context.routesQueried = context.routesQueried || [];
+                    routesQueried = context.routesQueried = context.routesQueried || [],
+                    childMatch = new Map();
 
                 matches.to((...args) => {
                     let params = args.pop();
@@ -66,10 +67,10 @@ define([
                         applyToChildren(childInstance.children, instance => {
                             if (instance) {
                                 //TODO: maybe not need Object.assign
-                                match(route, match => matchRoute(instance, Object.assign({}, context, {
+                                childMatch.set(instance, match(route, match => matchRoute(instance, Object.assign({}, context, {
                                     match,
                                     active
-                                })));
+                                }))));
                             }
                         });
                     }
@@ -91,6 +92,13 @@ define([
                                 if (!id) {
                                     dom.detach(childInstance);
                                 } else {
+                                    applyToChildren(childInstance.children, instance => {
+                                        const childRoute = childMatch.get(instance);
+                                        if (childRoute) {
+                                            childRoute.remove();
+                                            childMatch.delete(instance);
+                                        }
+                                    });
                                     destroyComponent(childInstance);
                                 }
                             },