You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2019/11/13 14:54:41 UTC
[cayenne-website] branch master updated (725e922 -> e22c9f3)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-website.git.
from 725e922 Move documentation link from docs to site config
new 8877d26 Add anchor links to documentation
new e22c9f3 update js dependencies
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/assets/package.json | 9 +++++----
src/main/assets/scripts/main.js | 25 +++++++++++++++++++------
src/main/assets/yarn.lock | 26 +++++++++++++++++---------
3 files changed, 41 insertions(+), 19 deletions(-)
[cayenne-website] 02/02: update js dependencies
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-website.git
commit e22c9f38e8a33e4f5ed82ae1d1df61e6ed30c905
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Nov 13 17:33:34 2019 +0300
update js dependencies
---
src/main/assets/package.json | 6 +++---
src/main/assets/yarn.lock | 21 ++++++++++++---------
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/assets/package.json b/src/main/assets/package.json
index e0af47c..96cc713 100644
--- a/src/main/assets/package.json
+++ b/src/main/assets/package.json
@@ -3,10 +3,10 @@
"version": "1.0.0",
"license": "Apache-2.0",
"dependencies": {
- "jquery": "3.3.1",
+ "jquery": "3.4.1",
"bootstrap": "4.3.1",
- "popper.js": "1.14.7",
- "highlight.js": "9.15.6",
+ "popper.js": "1.16.0",
+ "highlight.js": "9.16.2",
"font-awesome": "4.7.0",
"anchor-js": "4.2.1"
},
diff --git a/src/main/assets/yarn.lock b/src/main/assets/yarn.lock
index 7eeffbb..aedef41 100644
--- a/src/main/assets/yarn.lock
+++ b/src/main/assets/yarn.lock
@@ -2829,9 +2829,10 @@ hawk@~6.0.2:
hoek "4.x.x"
sntp "2.x.x"
-highlight.js@9.15.6:
- version "9.15.6"
- resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.6.tgz#72d4d8d779ec066af9a17cb14360c3def0aa57c4"
+highlight.js@9.16.2:
+ version "9.16.2"
+ resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
+ integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==
hmac-drbg@^1.0.0:
version "1.0.1"
@@ -3341,9 +3342,10 @@ jpegtran-bin@^3.0.0:
bin-wrapper "^3.0.0"
logalot "^2.0.0"
-jquery@3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
+jquery@3.4.1:
+ version "3.4.1"
+ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
+ integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
js-base64@^2.1.8:
version "2.3.2"
@@ -4678,9 +4680,10 @@ plur@^2.1.2:
dependencies:
irregular-plurals "^1.0.0"
-popper.js@1.14.7:
- version "1.14.7"
- resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e"
+popper.js@1.16.0:
+ version "1.16.0"
+ resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.0.tgz#2e1816bcbbaa518ea6c2e15a466f4cb9c6e2fbb3"
+ integrity sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==
portscanner@2.1.1:
version "2.1.1"
[cayenne-website] 01/02: Add anchor links to documentation
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne-website.git
commit 8877d2662ab27a640accbc08d117996dc8377b79
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Nov 13 17:25:35 2019 +0300
Add anchor links to documentation
---
src/main/assets/package.json | 3 ++-
src/main/assets/scripts/main.js | 25 +++++++++++++++++++------
src/main/assets/yarn.lock | 5 +++++
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/assets/package.json b/src/main/assets/package.json
index 918c321..e0af47c 100644
--- a/src/main/assets/package.json
+++ b/src/main/assets/package.json
@@ -7,7 +7,8 @@
"bootstrap": "4.3.1",
"popper.js": "1.14.7",
"highlight.js": "9.15.6",
- "font-awesome": "4.7.0"
+ "font-awesome": "4.7.0",
+ "anchor-js": "4.2.1"
},
"devDependencies" : {
"gulp": "^3.9.1",
diff --git a/src/main/assets/scripts/main.js b/src/main/assets/scripts/main.js
index 897baef..b32a426 100644
--- a/src/main/assets/scripts/main.js
+++ b/src/main/assets/scripts/main.js
@@ -22,13 +22,15 @@ require('bootstrap/js/dist/collapse');
require('bootstrap/js/dist/dropdown');
require('bootstrap/js/dist/scrollspy');
-function initHljs() {
- var hljs = require('highlight.js/lib/highlight.js');
- var xml = require('highlight.js/lib/languages/xml.js');
- var java = require('highlight.js/lib/languages/java.js');
- var sql = require('highlight.js/lib/languages/sql.js');
- var groovy = require('highlight.js/lib/languages/groovy.js');
+var anchorJS = require('anchor-js');
+
+var hljs = require('highlight.js/lib/highlight.js');
+var xml = require('highlight.js/lib/languages/xml.js');
+var java = require('highlight.js/lib/languages/java.js');
+var sql = require('highlight.js/lib/languages/sql.js');
+var groovy = require('highlight.js/lib/languages/groovy.js');
+function initHljs() {
hljs.registerLanguage('xml', xml);
hljs.registerLanguage('java', java);
hljs.registerLanguage('sql', sql);
@@ -43,8 +45,19 @@ function initGitHubBadge() {
});
}
+function initAnchors() {
+ var anchors = new anchorJS();
+ anchors
+ .add(".cd-content h2")
+ .add(".cd-content h3")
+ .add(".cd-content h4")
+ .add(".cd-content h5")
+ .add(".cd-content h6");
+}
+
$(document).ready(function () {
initHljs();
+ initAnchors();
initGitHubBadge();
});
diff --git a/src/main/assets/yarn.lock b/src/main/assets/yarn.lock
index 65e6377..7eeffbb 100644
--- a/src/main/assets/yarn.lock
+++ b/src/main/assets/yarn.lock
@@ -75,6 +75,11 @@ amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+anchor-js@4.2.1:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/anchor-js/-/anchor-js-4.2.1.tgz#983d40b4950c07bca838242e4f46606dfbba49ae"
+ integrity sha512-v2NFSBkEoal1GatM8YoL9bV1mS9729Xs1vIvASNKCQH16BgRiyFi6pqGdbtEXzUCwm6i5DRG0kYlhAEkMdCw5g==
+
ansi-regex@^0.2.0, ansi-regex@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"