Load correct initial page in HTML report (#133)

* Fix onHashChange * fixes from review
EdgedesignCZ · Jun 13, 2018 · 8fd70bf · 8fd70bf
1 parent 5cf028a
commit 8fd70bf
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@
 phpstan-phpqa.neon
 .php_cs
 .php_cs.cache
-psalm-phpqa.xml
+psalm-phpqa.xml
diff --git a/app/report/phpqa.html.twig b/app/report/phpqa.html.twig
@@ -14,7 +14,7 @@ set tabs = {
         'complexity.html': 'Complexity & defects',
         'oop.html': 'Object oriented metrics',
         'relations.html': 'Object relations',
-    }, 
+    },
     'pdepend': {
         'overview': 'Overview',
         'packages': 'Packages',
@@ -27,24 +27,24 @@ set tabs = {
         'metrics-class': 'Class metrics',
         'metrics-method': 'Method metrics',
         'metrics-function': 'Function metrics',
-    }, 
+    },
     'phpcs': {
         'overview': 'Overview',
         'errors': 'Errors',
-    }, 
+    },
     'php-cs-fixer': {
         'overview': 'Overview',
         'errors': 'Errors',
-    }, 
+    },
     'phpmd': {
         'overview': 'Overview',
         'errors': 'Errors',
         'parsing': 'Parsing Errors',
-    }, 
+    },
     'phpcpd': {
         'overview': 'Overview',
         'errors': 'Errors',
-    }, 
+    },
     'phploc': {
         'overview': 'Overview',
         'ccn': 'Cyclomatic Complexity',
@@ -140,7 +140,7 @@ set tabs = {
         </div>
       </div>
     </nav>
-                
+
     <div class="tab-content">
         <div role="tabpanel" class="tab-pane active" id="phpqa">
             <div class="container-fluid">
@@ -199,7 +199,7 @@ set tabs = {
                                             <td>
                                                 <span class="label label-success">✓</span>
                                             </td>
-                                            {% else %}   
+                                            {% else %}
                                             <td data-toggle="tooltip" data-placement="left" title="{{ not isPhpqa ? ('Errors count is greater than '~result.allowedErrorsCount) : '' }}">
                                                 <span class="label label-danger">x</a>
                                             </td>
@@ -275,24 +275,33 @@ set tabs = {
                 {% else %}
                 var url = $('#iframe-phpmetrics').attr('data-src').replace('index.html', tab);
                 iframe.src = url;
-                {% endif %}    
+                {% endif %}
             },
             '#psalm': openBootstrap,
         };
         var loadedIframes = [];
         listenOnTabChange();
         activateTooltips();
         listenOnFileModal();
+        loadFromHash();
 
         function openBootstrap(iframe, tab) {
             iframe.$("nav [aria-controls=" + tab + "]").tab('show');
         }
-        
+
+        function loadFromHash() {
+          var hash = location.hash ? location.hash : '#phpqa';
+          var activeTab = $('.navbar-nav [href="' + hash + '"]').first();
+          if (activeTab.length) {
+            activeTab.click();
+          }
+        }
+
         function listenOnTabChange() {
             onNavLink();
             onExternalLink();
             onHashChange();
-            
+
             function onNavLink() {
                 $('.navbar-nav a').click(function (e) {
                     e.preventDefault();
@@ -336,10 +345,10 @@ set tabs = {
                     navLink.tab('show');
                     updateBrowserHistory(navLink);
                 }
-                
+
                 function updateBrowserHistory(link) {
                     if (window.history && window.history.pushState) {
-                        history.pushState(null, null, link.attr('href'));  
+                        history.pushState(null, null, link.attr('href'));
                     }
                 }
 
@@ -358,7 +367,7 @@ set tabs = {
                     }
                 }
             }
-            
+
             function onExternalLink() {
                 $('[data-tool-link]').click(function (e) {
                     e.preventDefault();
@@ -368,15 +377,11 @@ set tabs = {
 
             function onHashChange() {
                 window.addEventListener("popstate", function(e) {
-                    var hash = location.hash ? location.hash : '#phpqa';
-                    var activeTab = $('.navbar-nav [href="' + hash + '"]').first();
-                    if (activeTab.length) {
-                        activeTab.tab('show');
-                    }
+                    loadFromHash();
                 });
             }
         }
-        
+
         function activateTooltips() {
             $('[data-toggle="tooltip"]').tooltip()
         }