p3x-robot sunday release 2018-5-11 23:20:11

README.md

@@ -63,8 +63,10 @@ If you just want to get the project dependencies, instead of building everything
 git clone https://github.com/patrikx3/gitlist.git
 curl -s http://getcomposer.org/installer | php
 php composer.phar install
-bower install
+npm i -g npm
+npm install
 grunt
+npm run webpack
 ```
 
 If you have Composer in your path, things get easier. But you know the drill.

scripts/optimize.sh

@@ -6,7 +6,7 @@ pushd $TOP
 composer install
 composer install --no-dev
 composer dump-autoload --optimize
-bower install --allow-root
 npm install
 grunt
+npm run webpack
 popd

src/Git/Repository.php

@@ -341,12 +341,13 @@ public function searchTree($query, $branch)
 
             preg_match_all('/([\w-._]+):([^:]+):([0-9]+):(.+)/', $result, $matches, PREG_SET_ORDER);
 
-            $data['branch'] = $matches[0][1];
-            $data['file'] = $matches[0][2];
-            $data['line'] = $matches[0][3];
-            $data['match'] = $matches[0][4];
-
-            $searchResults[] = $data;
+            if (isset($matches[0])) {
+                $data['branch'] = $matches[0][1];
+                $data['file'] = $matches[0][2];
+                $data['line'] = $matches[0][3];
+                $data['match'] = $matches[0][4];
+                $searchResults[] = $data;
+            }
         }
 
         return $searchResults;

themes/bootstrap/js/main.js

@@ -158,26 +158,52 @@ $(function () {
         $pager.find('.previous').remove();
     }
     paginate();
-});
 
-if ($('#repositories').length) {
-    var listOptions = {
-        valueNames: ['name']
-    };
-    var repoList = new List('repositories', listOptions);
-}
+    var es = document.getElementsByTagName('a')
+    for(var i=0; i<es.length; i++){
+        es[i].addEventListener('click', function(e) {
+            var href = e.target.getAttribute('href');
+            if (href === null) {
+                return;
+            }
+            if (href.startsWith('#')) {
+                e.preventDefault()
+                var el = document.getElementById(href.substring(1));
+                if (el === null) {
+                    return;
+                }
+                el.scrollIntoView({
+                    behavior: 'smooth',
+                    block: "center",
 
-if ($('#branchList').length) {
-    var listBranchOptions = {
-        valueNames: ['item']
-    };
-    var repoList = new List('branchList', listBranchOptions);
-}
+                })
+
+            }
+        })
+    }
+
+    if ($('#repositories').length) {
+        var listOptions = {
+            valueNames: ['name']
+        };
+        var repoList = new global.List('repositories', listOptions);
+    }
+
+    if ($('#branchList').length) {
+        var listBranchOptions = {
+            valueNames: ['item']
+        };
+        var repoList = new global.List('branchList', listBranchOptions);
+    }
+
+    $('.search').click(function (e) {
+        e.stopPropagation();
+    });
 
-$('.search').click(function (e) {
-    e.stopPropagation();
 });
 
+
+
 global.gitlist.scrollHash = function(element, event) {
     var url = new URL(element.href)
     var id = url.hash.substring(1)
@@ -203,29 +229,3 @@ global.gitlist.scrollHash = function(element, event) {
     }
     return false;
 }
-
-document.addEventListener('DOMContentLoaded', function(){
-    var es = document.getElementsByTagName('a')
-    for(var i=0; i<es.length; i++){
-        es[i].addEventListener('click', function(e) {
-            var href = e.target.getAttribute('href');
-            if (href === null) {
-                return;
-            }
-            if (href.startsWith('#')) {
-                e.preventDefault()
-                var el = document.getElementById(href.substring(1));
-                if (el === null) {
-                    return;
-                }
-                el.scrollIntoView({
-                    behavior: 'smooth',
-                    block: "center",
-
-                })
-
-            }
-        })
-    }
-
-})