From b13f321c261465bf808a408b674cb8860f1f77ea Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Sat, 14 May 2016 16:54:56 +0200
Subject: [PATCH] Fix routing with updated carbon-route

---
 bower.json                              |  4 +--
 src/projects/project-pull-requests.html |  5 +---
 src/projects/projects-page.html         | 36 +++++++++++--------------
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/bower.json b/bower.json
index e89149f..a53186c 100644
--- a/bower.json
+++ b/bower.json
@@ -19,14 +19,14 @@
     "paper-elements": "polymerelements/paper-elements#^1.0.7",
     "carbon-elements": "polymerelements/carbon-elements#^0.1.0",
     "iron-elements": "polymerelements/iron-elements#^1.0.10",
-    "carbon-route": "TimvdLippe/carbon-route#subroute-updating",
+    "carbon-route": "TimvdLippe/carbon-route#reset-tail",
     "iron-lazy-pages": "^1.0.2",
     "Sortable": "TimvdLippe/Sortable#fix-es5-compilation",
     "marked-element": "TimvdLippe/marked-element#expose-callback",
     "prism-element": "TimvdLippe/prism-element#fork"
   },
   "resolutions": {
-    "carbon-route": "subroute-updating",
+    "carbon-route": "reset-tail",
     "marked-element": "expose-callback",
     "prism-element": "fork"
   },
diff --git a/src/projects/project-pull-requests.html b/src/projects/project-pull-requests.html
index 2638c2d..23ff6bb 100644
--- a/src/projects/project-pull-requests.html
+++ b/src/projects/project-pull-requests.html
@@ -65,7 +65,7 @@
 
     </style>
     <preview-list hide-end-indicator>
-      <iron-icon hidden$="{{_hideButton(hideProjectButton)}}" class$="back-button [[projectButtonClicked]]" icon="icon:icons:arrow-back" on-tap="_showProjects"></iron-icon>
+      <iron-icon hidden$="{{!hideProjectButton}}" class$="back-button [[projectButtonClicked]]" icon="icon:icons:arrow-back" on-tap="_showProjects"></iron-icon>
       <h2>[[name]]</h2>
       <div class=dropdown>
         <paper-dropdown-menu label="Pull request status" value="{{status}}">
@@ -145,9 +145,6 @@ <h2>[[name]]</h2>
       },
       _resetButton: function() {
         this.projectButtonClicked = false;
-      },
-      _hideButton: function(clicked){
-        return this._equals(clicked,undefined);
       }
     });
   </script>
diff --git a/src/projects/projects-page.html b/src/projects/projects-page.html
index a43b722..5255bde 100644
--- a/src/projects/projects-page.html
+++ b/src/projects/projects-page.html
@@ -47,29 +47,23 @@
       preview-list {
         overflow-y: auto;
         overflow-x: hidden;
+        -webkit-transition: flex 0.5s ease;
+        -moz-transition: flex 0.5s ease;
+        -o-transition: flex 0.5s ease;
+        transition: flex 0.5s ease;
       }
       a {
         color: inherit;
       }
       preview-list.false {
         flex: 0 0;
-        -webkit-transition: flex 0.5s ease;
-        -moz-transition: flex 0.5s ease;
-        -o-transition: flex 0.5s ease;
-        transition: flex 0.5s ease;
-      }
-      preview-list.true {
-        -webkit-transition: flex 0.5s ease;
-        -moz-transition: flex 0.5s ease;
-        -o-transition: flex 0.5s ease;
-        transition: flex 0.5s ease;
       }
       search-box {
         margin-top:19.920px;
       }
     </style>
-    <carbon-route route="{{route}}" pattern="/:owner/:name" data="{{projectTitle}}" tail="{{nameTail}}"></carbon-route>
-    <carbon-route route="{{nameTail}}" pattern="/pulls/:pr" data="{{pr}}" tail="{{prTail}}"></carbon-route>
+    <carbon-route route="{{route}}" pattern="/:owner/:name" data="{{projectTitle}}" tail="{{nameTail}}" active="{{projectSelected}}"></carbon-route>
+    <carbon-route route="{{nameTail}}" pattern="/pulls/:pr" data="{{pr}}" tail="{{prTail}}" active="{{pullRequestSelected}}"></carbon-route>
 
     <authenticated-ajax
       id="ajaxPullRequest"
@@ -87,13 +81,13 @@
         </template>
       </preview-list>
       <div class="container">
-        <project-pull-requests hidden$="[[!projectTitle.name]]" route="{{nameTail}}" tabindex="0"
+        <project-pull-requests hidden$="[[!projectSelected]]" route="{{nameTail}}" tabindex="0"
                                owner="[[projectTitle.owner]]" name="[[projectTitle.name]]" pullrequests="[[pullrequests]]"
                                project-button-clicked="{{projectButtonClicked}}"
-                               hide-project-button="[[pr.pr]]"></project-pull-requests>
+                               hide-project-button="[[pullRequestSelected]]"></project-pull-requests>
 
         <iron-pages class="project"
-                    selected="[[_getCurrentView(projectTitle, pr)]]"
+                    selected="[[_getCurrentView(projectSelected, pullRequestSelected)]]"
                     attr-for-selected="data-route">
             <no-project-selected data-route="no-selected"></no-project-selected>
             <project-overview-page data-route="overview" tabindex="0"
@@ -123,7 +117,7 @@
         },
         shouldShowProjects: {
           type: String,
-          computed: '_shouldShowProjects(projectTitle, pr, projectButtonClicked)'
+          computed: '_shouldShowProjects(projectSelected, pullRequestSelected, projectButtonClicked)'
         },
         projects: {
           type: Array,
@@ -200,16 +194,16 @@
       _isActiveProject: function(name, project, activeProject) {
         return !!name && project === activeProject;
       },
-      _getCurrentView: function(name, pr) {
-        if (!name.name) {
+      _getCurrentView: function(projectSelected, pullRequestSelected) {
+        if (!projectSelected) {
           return 'no-selected';
-        } else if (!pr.pr) {
+        } else if (!pullRequestSelected) {
           return 'overview';
         }
         return 'pr';
       },
-      _shouldShowProjects: function(name, pr, clicked) {
-        return (this._getCurrentView(name, pr) !== 'pr' || clicked) ? 'true' : 'false';
+      _shouldShowProjects: function(projectSelected, pullRequestSelected, clicked) {
+        return (!pullRequestSelected || clicked) ? 'true' : 'false';
       }
     });
   </script>