merging with latest changes

galtamas · Feb 21, 2015 · dc8aece · dc8aece
2 parents 0fe6934 + 341d6aa
commit dc8aece
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/app-router.js b/src/app-router.js
@@ -217,6 +217,17 @@
     // keep track of the route currently being loaded
     router.loadingRoute = route;
 
+    // Update model instead of re-rendering if we're on the same route
+    if (router.activeRoute && router.activeRoute === route && route.firstElementChild) {
+      var model = createModel(router, route, url, eventDetail);
+      for (var property in model) {
+        if (model.hasOwnProperty(property)) {
+          route.firstElementChild[property] = model[property];
+        }
+      }
+      return;
+    }
+
     // import custom element or template
     if (route.hasAttribute('import')) {
       importAndActivate(router, route.getAttribute('import'), route, url, eventDetail);