p3x-robot sunday release 2018-5-14 23:41:26

INSTALL.md

@@ -116,7 +116,7 @@ UrlToolkit {
 
 ---
 
-[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.0.16-591 
+[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.0.18-595 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

README.md

@@ -4,7 +4,7 @@
 
 
 
-# 🤖 P3X Gitlist v2.0.16-591  
+# 🤖 P3X Gitlist v2.0.18-595  
 
 This is an open-source project. Star this repository if you like it, or even donate!  Thank you so much! :)
 
@@ -35,7 +35,7 @@ https://nodejs.org/en/download/package-manager/
                         
 [//]: #@corifeus-header:end
 
-This is Klaus Silveira's fork, with multiple themes, sub-modules and updated to PHP7 only and upgraded all components.
+This is Klaus Silveira's fork, with multiple themes (dark/light), sub-modules, uglify-es, webpack, toast, pure Bootstrap 3 and upgraded to PHP7.1 with all components.
 
 ### PHP > 7.1 only
 
@@ -145,7 +145,7 @@ npm run watch
 
 ---
 
-[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.0.16-591 
+[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.0.18-595 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

artifacts/php-7.2-ubuntu.md

@@ -4,7 +4,8 @@
 
                         
 [//]: #@corifeus-header:end
-# Install PHP 7.2 on Ubuntu
+
+# Install PHP 7.2 on Ubuntu before Bionic
 
 ```bash
 sudo add-apt-repository ppa:ondrej/php
@@ -19,7 +20,7 @@ sudo apt upgrade -y
 
 ---
 
-[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.0.16-591 
+[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.0.18-595 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

changelog.md

@@ -137,7 +137,7 @@ require('codemirror/mode/yaml/yaml');
 
 ---
 
-[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.0.16-591 
+[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.0.18-595 
 
 [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software) [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) 
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "p3x-gitlist",
-    "version": "2.0.16-591",
+    "version": "2.0.18-595",
     "corifeus": {
         "prefix": "p3x-",
         "publish": false,

public/js/bundle.js

@@ -1,5 +1,6 @@
 require('codemirror/lib/codemirror.css')
-require('codemirror/theme/blackboard.css')
+require('codemirror/theme/dracula.css')
+require('codemirror/theme/idea.css')
 require('../less/style.less')
 require('../less/fontawesome.less')
 
@@ -56,6 +57,6 @@ require('./clone-buttons')
 require('./paginate')
 require('./search-branch')
 require('./search-repositories')
-require('./global')
 require('./theme-switcher.js')
+require('./global')
 

public/js/code-mirror.js

@@ -21,21 +21,25 @@ document.addEventListener("DOMContentLoaded", function(event) {
             expires: 3650
         }
 
-        buttonScroll.click(() => {
+        const setScroll = () => {
             buttonFull.removeClass('active')
             buttonScroll.addClass('active')
             codeMirror.css('height', codeMirrorHeight)
             gitlist.viewer.setSize(null, codeMirrorHeight);
             Cookies.set(cookieName, 'scroll', cookieSettings)
-        })
+        }
+
+        buttonScroll.click(setScroll)
 
-        buttonFull.click(() => {
+        const setFull = () => {
             buttonScroll.removeClass('active')
             buttonFull.addClass('active')
             codeMirror.css('height', 'auto')
             gitlist.viewer.setSize(null, '100%');
             Cookies.set(cookieName, 'full', cookieSettings)
-        })
+        }
+
+        buttonFull.click(setFull)
 
         gitlist.viewer = CodeMirror(function(elt) {
             pre.parentNode.replaceChild(elt, pre);
@@ -46,22 +50,12 @@ document.addEventListener("DOMContentLoaded", function(event) {
             lineWrapping: true,
             readOnly: true,
             mode: mode,
+            theme: window.gitlist.getActualThemeCodemirror(),
         });
-
-        const setCodeMirror = function() {
-            if (gitlist.getThemeCookie !== undefined) {
-                global.gitlist.setTheme()
-            } else {
-                setTimeout(function() {
-                    setCodeMirror()
-                    if (currentSizing !== 'scroll') {
-                        buttonFull.click();
-                    } else {
-                        buttonScroll.click();
-                    }
-                })
-            }
+        if (currentSizing === 'full') {
+            setFull()
+        } else {
+            setScroll()
         }
-        setCodeMirror()
     }
 })

public/js/global.js

@@ -1,3 +1,4 @@
+
 window.gitlist.isDark =(theme) => {
     for(var i = 0; i < window.gitlist.dark.length; i++ ) {
         if (window.gitlist.dark[i] === theme) {
@@ -9,26 +10,44 @@ window.gitlist.isDark =(theme) => {
 
 let $body;
 
+window.gitlist.codemirrorTheme = {
+    light: 'idea',
+    dark: 'dracula',
+}
+
+window.gitlist.getActualTheme = () => {
+    const theme = window.gitlist.getThemeCookie()
+    const actualTheme = theme.split('-')[1]
+    return actualTheme;
+}
+
+window.gitlist.getActualThemeCodemirror = () => {
+    if (window.gitlist.isDark(window.gitlist.getActualTheme())) {
+        return window.gitlist.codemirrorTheme.dark;
+    } else {
+        return window.gitlist.codemirrorTheme.light;
+    }
+}
+
 window.gitlist.setTheme = () => {
-    if ($body === undefined) {
+    if ($body === undefined || window.gitlist.getThemeCookie === undefined) {
         setTimeout(() => {
-            window.gitlist.setTheme(theme)
+            window.gitlist.setTheme()
         })
         return;
     }
-    const theme = global.gitlist.getThemeCookie()
-    const actualTheme = theme.split('-')[1]
-    if (window.gitlist.isDark(actualTheme)) {
+    const theme = window.gitlist.getActualTheme();
+    if (window.gitlist.isDark(theme)) {
         $body.addClass('p3x-gitlist-dark')
         $body.removeClass('p3x-gitlist-light')
         if (gitlist.viewer !== undefined) {
-            gitlist.viewer.setOption("theme", 'blackboard');
+            gitlist.viewer.setOption("theme", window.gitlist.codemirrorTheme.dark);
         }
     } else {
         $body.addClass('p3x-gitlist-light')
         $body.removeClass('p3x-gitlist-dark')
         if (gitlist.viewer !== undefined) {
-            gitlist.viewer.setOption("theme", 'default');
+            gitlist.viewer.setOption("theme", window.gitlist.codemirrorTheme.light);
         }
     }
     let setTimeoutSwitch;

public/js/theme-switcher.js

@@ -1,3 +1,13 @@
+const Cookies = require('js-cookie')
+const themeCookieName = 'gitlist-bootstrap-theme'
+
+function getThemeCookie() {
+    const theme = Cookies.get(themeCookieName)
+    return theme || 'bootstrap-cosmo';
+}
+
+gitlist.getThemeCookie = getThemeCookie;
+
 document.addEventListener("DOMContentLoaded", function(event) {
 
     const themes = require('./themes.js')
@@ -10,15 +20,6 @@ document.addEventListener("DOMContentLoaded", function(event) {
         menuList: themeList,
     })
 
-    const Cookies = require('js-cookie')
-    const themeCookieName = 'gitlist-bootstrap-theme'
-
-    function getThemeCookie() {
-        const theme = Cookies.get(themeCookieName)
-        return theme || 'bootstrap-cosmo';
-    }
-
-    gitlist.getThemeCookie = getThemeCookie;
 
     function setThemeCookie(theme) {
         Cookies.set(themeCookieName, theme,  { expires: 3650, path: '/' });