Fix back button tab switch. (#1003)

isoos · web-flow · commit 3dd59165d997 · 2018-02-21T10:40:10.000+01:00
diff --git a/app/test/frontend/golden/authorized_page.html b/app/test/frontend/golden/authorized_page.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/error_page.html b/app/test/frontend/golden/error_page.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/flutter_landing_page.html b/app/test/frontend/golden/flutter_landing_page.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/index_page.html b/app/test/frontend/golden/index_page.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/pkg_index_page.html b/app/test/frontend/golden/pkg_index_page.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/pkg_show_page.html b/app/test/frontend/golden/pkg_show_page.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/pkg_show_page_deprecated.html b/app/test/frontend/golden/pkg_show_page_deprecated.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/pkg_show_page_flutter_plugin.html b/app/test/frontend/golden/pkg_show_page_flutter_plugin.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/pkg_show_page_outdated.html b/app/test/frontend/golden/pkg_show_page_outdated.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/pkg_show_version_page.html b/app/test/frontend/golden/pkg_show_version_page.html
@@ -20,7 +20,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/pkg_versions_page.html b/app/test/frontend/golden/pkg_versions_page.html
@@ -20,7 +20,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/search_page.html b/app/test/frontend/golden/search_page.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/search_supported_qualifier.html b/app/test/frontend/golden/search_supported_qualifier.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/search_unsupported_qualifier.html b/app/test/frontend/golden/search_unsupported_qualifier.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/app/test/frontend/golden/web_landing_page.html b/app/test/frontend/golden/web_landing_page.html
@@ -18,7 +18,7 @@
   <link rel="alternate" type="application/atom+xml" title="Updated Packages Feed for Pub" href="/feed.atom" />
   <link href="/static/highlight/github.css" rel="stylesheet" />
   <link href="/static/css/style.css?hash=e04t8j4c9t71h5ha7p4pdkgq33og2ucf" rel="stylesheet" type="text/css" />
-  <script src="/static/js/script.dart.js?hash=1mdhgmfm490300v0h9lp3d23q52dlicd" defer></script>
+  <script src="/static/js/script.dart.js?hash=dpnjl27j3qcb445c0v5519t0j84ob0km" defer></script>
   <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/static/js/script.dart b/static/js/script.dart
@@ -118,10 +118,16 @@ void _setEventForMobileNav() {
   });
 }
 
+/// change the tab based on URL hash
 void _changeTabOnUrlHash() {
-  // change the tab based on URL hash
-  if (tabRoot != null && (window.location.hash ?? '').isNotEmpty) {
-    _changeTab(window.location.hash.substring(1));
+  if (tabRoot == null) return;
+  final hash = window.location.hash ?? '';
+  // Navigating back to a non-hashed package page will result an empty hash.
+  // Displaying the default tab: readme.
+  if (hash.isEmpty) {
+    _changeTab('-readme-tab-');
+  } else {
+    _changeTab(hash.substring(1));
   }
 }
 
diff --git a/static/js/script.dart.js b/static/js/script.dart.js
diff --git a/static/js/script.dart.js.info.json b/static/js/script.dart.js.info.json
diff --git a/static/js/script.dart.js.map b/static/js/script.dart.js.map

Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,16 @@ void _setEventForMobileNav() {`
`118`	`118`	`});`
`119`	`119`	`}`
`120`	`120`
	`121`	`+/// change the tab based on URL hash`
`121`	`122`	`void _changeTabOnUrlHash() {`
`122`		`- // change the tab based on URL hash`
`123`		`- if (tabRoot != null && (window.location.hash ?? '').isNotEmpty) {`
`124`		`- _changeTab(window.location.hash.substring(1));`
	`123`	`+ if (tabRoot == null) return;`
	`124`	`+ final hash = window.location.hash ?? '';`
	`125`	`+ // Navigating back to a non-hashed package page will result an empty hash.`
	`126`	`+ // Displaying the default tab: readme.`
	`127`	`+ if (hash.isEmpty) {`
	`128`	`+ _changeTab('-readme-tab-');`
	`129`	`+ } else {`
	`130`	`+ _changeTab(hash.substring(1));`
`125`	`131`	`}`
`126`	`132`	`}`
`127`	`133`