Skip to content

Commit cac9da7

Browse files
author
markzegarelli
authored
Merge branch 'master' into kameleoon
2 parents aff1b31 + 311708d commit cac9da7

File tree

30 files changed

+1053
-264
lines changed

30 files changed

+1053
-264
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ GIT
2121
GEM
2222
remote: https://rubygems.org/
2323
specs:
24-
addressable (2.7.0)
24+
addressable (2.8.0)
2525
public_suffix (>= 2.0.2, < 5.0)
2626
algolia_html_extractor (2.6.4)
2727
json (~> 2.0)

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ description: ""
33
baseurl: "/docs" # the subpath of your site, e.g. /blog
44
url: "https://segment.com" # the base hostname & protocol for your site, e.g. http://example.com
55
source: ./src
6+
incremental: true
67

78

89
permalink: /:categories/:title/

js/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import tracking from './tracking'
2020
import searchBar from './search-bar'
2121
import glightbox from './glightbox'
2222
import autocomplete from './algolia'
23+
import mapTable from './map-table'
2324
feedback()
2425
accordion()
2526
accordionGroup()
@@ -40,4 +41,5 @@ relativeLinks()
4041
sideMenu()
4142
tracking()
4243
searchBar()
43-
glightbox()
44+
glightbox()
45+
mapTable()

js/littlefoot/index.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { littlefoot } from 'littlefoot'
2+
3+
export default function () {
4+
littlefoot({
5+
}
6+
)
7+
8+
}

js/map-table/index.js

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
export default function () {
2+
3+
clickFilter("all")
4+
5+
var links = document.getElementsByClassName("button-link");
6+
7+
8+
document.querySelectorAll('.button-link').forEach(item => {
9+
let v = item.getAttribute('id');
10+
item.addEventListener('click', (event => {
11+
event.preventDefault();
12+
clickFilter(v);
13+
}))
14+
})
15+
16+
17+
function clickFilter(c) {
18+
var x, i;
19+
x = document.getElementsByClassName("settingRow");
20+
if (c == "all") c = "";
21+
for (i = 0; i < x.length; i++) {
22+
w3RemoveClass(x[i], "show");
23+
if (x[i].className.indexOf(c) > -1) w3AddClass(x[i], "show");
24+
}
25+
}
26+
27+
// Show filtered elements
28+
function w3AddClass(element, name) {
29+
var i, arr1, arr2;
30+
arr1 = element.className.split(" ");
31+
arr2 = name.split(" ");
32+
for (i = 0; i < arr2.length; i++) {
33+
if (arr1.indexOf(arr2[i]) == -1) {
34+
element.className += " " + arr2[i];
35+
}
36+
}
37+
}
38+
39+
// Hide elements that are not selected
40+
function w3RemoveClass(element, name) {
41+
var i, arr1, arr2;
42+
arr1 = element.className.split(" ");
43+
arr2 = name.split(" ");
44+
for (i = 0; i < arr2.length; i++) {
45+
while (arr1.indexOf(arr2[i]) > -1) {
46+
arr1.splice(arr1.indexOf(arr2[i]), 1);
47+
}
48+
}
49+
element.className = arr1.join(" ");
50+
}
51+
52+
var btnContainer = document.getElementById("btnContainer");
53+
var btns = document.getElementsByClassName("button-link");
54+
for (var i = 0; i < btns.length; i++) {
55+
btns[i].addEventListener("click", function () {
56+
var current = document.getElementsByClassName("active");
57+
current[0].className = current[0].className.replace(" active", "");
58+
this.className += " active";
59+
});
60+
}
61+
}

netlify.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@
1111
command = "yarn develop"
1212
ignore = "./scripts/ignore.sh"
1313

14+
[context.branch-deploy]
15+
command = "yarn develop-inc"
16+
ignore = "./scripts/ignore.sh"
17+
18+
[[context.branch-deploy.plugins]]
19+
package = "netlify-plugin-jekyll-cache"
20+
21+
[context.branch-deploy.plugins.inputs]
22+
jekyllSource = "/src"
23+
24+
25+
1426
[[redirects]]
1527
from = "/docs/*"
1628
to = "/:splat"

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
]
1212
},
1313
"scripts": {
14-
"develop": "bundle exec jekyll clean && webpack --mode production && JEKYLL_ENV=testing bundle exec jekyll build --trace -V"
15-
},
14+
"develop": "bundle exec jekyll clean && webpack --mode production && JEKYLL_ENV=testing bundle exec jekyll build --trace -V",
15+
"develop-inc": "webpack --mode production && JEKYLL_ENV=testing bundle exec jekyll build --trace -V -I"
16+
17+
},
1618
"devDependencies": {
1719
"@babel/cli": "^7.6.0",
1820
"@babel/core": "^7.6.0",

scripts/catalog_papi.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,10 @@ const updateSources = async () => {
258258

259259
const hiddenSources = [
260260
'amp',
261-
'factual-engine'
261+
'factual-engine',
262+
'kotlin-android',
263+
'kotlin',
264+
'swift-ios'
262265
]
263266

264267
sources.forEach(source => {

0 commit comments

Comments
 (0)