diff --git a/Gruntfile.js b/Gruntfile.js index f09a18cb..f1e43df0 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -44,6 +44,7 @@ module.exports = function (grunt) { ] }, + }, less: { development: require('./src/browser/grunt/less').lessSettings(grunt), diff --git a/INSTALL.md b/INSTALL.md index cceb3751..463be62d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -116,7 +116,7 @@ UrlToolkit { --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.6-887 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.8-888 [](https://www.facebook.com/corifeus.software) [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [](https://www.patrikx3.com/en/front/contact) diff --git a/README.md b/README.md index 4841c1b6..ceb58384 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ -# 🤖 P3X Gitlist v2.9.6-887 +# 🤖 P3X Gitlist v2.9.8-888 This is an open-source project. Star this repository if you like it, or even donate! Thank you so much! :) @@ -171,7 +171,7 @@ npm run watch --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.6-887 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.8-888 [](https://www.facebook.com/corifeus.software) [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [](https://www.patrikx3.com/en/front/contact) diff --git a/artifacts/php-7.2-ubuntu.md b/artifacts/php-7.2-ubuntu.md index d5845726..cb0d28ec 100644 --- a/artifacts/php-7.2-ubuntu.md +++ b/artifacts/php-7.2-ubuntu.md @@ -20,7 +20,7 @@ sudo apt upgrade -y --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.6-887 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.8-888 [](https://www.facebook.com/corifeus.software) [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [](https://www.patrikx3.com/en/front/contact) diff --git a/changelog.md b/changelog.md index 596e7cda..de76dfb6 100644 --- a/changelog.md +++ b/changelog.md @@ -139,7 +139,7 @@ require('codemirror/mode/yaml/yaml'); --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.6-887 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.8-888 [](https://www.facebook.com/corifeus.software) [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [](https://www.patrikx3.com/en/front/contact) diff --git a/package.json b/package.json index 7973e38c..8b0a46ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p3x-gitlist", - "version": "2.9.7-887", + "version": "2.9.9-889", "corifeus": { "prod-dir": "prod", "postfix": "2607a7cb45c1136298a2a2ccb0a3d49ec147c7dab987b6dd4ec124a716e92c92", diff --git a/public/web-worker/commit-diff.js b/public/web-worker/commit-diff.js index 5410c988..f435b679 100644 --- a/public/web-worker/commit-diff.js +++ b/public/web-worker/commit-diff.js @@ -1,11 +1,18 @@ + const showNumber = (lineInfo) => { const first = lineInfo.line[0]; return first === ' ' || first === '@' || first === '-' || first === '+'; } +let htmlEncode + const construct = (data) => { const diffs = data.diffs + for(let diffLineIndex in diffs.lines) { + diffs.lines[diffLineIndex].line = htmlEncode(diffs.lines[diffLineIndex].line) + } + let result = ` <table id="p3x-gitlist-commit-diff-ng-table" style="min-width: 100%; max-width: 100%"> <tr> @@ -45,6 +52,7 @@ const construct = (data) => { } onmessage = function(e) { + eval(`htmlEncode = ${e.data.htmlEncode}`) const result = construct(e.data); postMessage(result) } \ No newline at end of file diff --git a/src/browser/js/commit.js b/src/browser/js/commit.js index 5a546a29..bbe20af2 100644 --- a/src/browser/js/commit.js +++ b/src/browser/js/commit.js @@ -74,11 +74,15 @@ $(() => { worker.terminate() //console.log('worker.onmessage', event.data) }) - for(let diffLineIndex in diffs.lines) { + /* + for(let diffLineIndex in diffs.lines) { diffs.lines[diffLineIndex].line = htmlEncode(diffs.lines[diffLineIndex].line) } + */ worker.postMessage({ - diffs : diffs + diffs : diffs, + basepath: window.gitlist.basepath, + htmlEncode: window.htmlEncode.toString(), }); } }).catch(window.gitlist.ajaxErrorHandler) diff --git a/todo.md b/todo.md index 28071a92..7d5fd0ac 100644 --- a/todo.md +++ b/todo.md @@ -13,7 +13,7 @@ --- -[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.6-887 +[**P3X-GITLIST**](https://pages.corifeus.com/gitlist) Build v2.9.8-888 [](https://www.facebook.com/corifeus.software) [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6) [](https://www.patrikx3.com/en/front/contact)