authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-07 14:47:59-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-07 14:47:59-04:00
log16de5a72284b9bc3c18f076fc05db7e9b35cae78
tree68460afc7a293c3e09d239a6c3cb5451131646b7
parentd70c30055e26be29fceede7559afec46a89a9f5c
signaturelock-open Commit is signed but in an unrecognized format.

generated docs: fix search stuff

2 files changed, 135 insertions(+), 114 deletions(-)

lib/std/special/docs/index.html+125-109
......@@ -5,118 +5,127 @@
55 <title>Documentation - Zig</title>
66 <link rel="icon" href="favicon.png">
77 <style type="text/css">
8 body {
9 font-family: system-ui, -apple-system, Roboto, "Segoe UI", sans-serif;
10 max-width: 60em;
11 }
12 .hidden {
13 display: none;
8 body {
9 font-family: system-ui, -apple-system, Roboto, "Segoe UI", sans-serif;
10 max-width: 60em;
11 }
12 .hidden {
13 display: none;
14 }
15 a {
16 color: #2A6286;
17 }
18 pre{
19 font-family:"Source Code Pro",monospace;
20 font-size:1em;
21 background-color:#F5F5F5;
22 padding:1em;
23 overflow-x: auto;
24 }
25 nav {
26 width: 10em;
27 position: fixed;
28 left: 0;
29 top: 0;
30 height: 100vh;
31 overflow: auto;
32 }
33 nav h2 {
34 font-size: 1.2em;
35 text-decoration: underline;
36 margin: 0;
37 padding: 0.5em 0;
38 text-align: center;
39 }
40 nav p {
41 margin: 0;
42 padding: 0;
43 text-align: center;
44 }
45 section {
46 margin-left: 10em;
47 }
48 section h1 {
49 border-bottom: 1px dashed;
50 }
51 section h2 {
52 font-size: 1.3em;
53 margin: 0.5em 0;
54 padding: 0;
55 border-bottom: 1px solid;
56 }
57 #listNav {
58 list-style-type: none;
59 margin: 0.5em 0 0 0;
60 padding: 0;
61 overflow: hidden;
62 background-color: #333;
63 }
64 #listNav li {
65 float:left;
66 }
67 #listNav li a {
68 display: block;
69 color: #fff;
70 text-align: center;
71 padding: .5em .8em;
72 text-decoration: none;
73 }
74 #listNav li a:hover {
75 background-color: #111;
76 }
77 #listNav li a.active {
78 background-color: #4CAF50;
79 }
80
81 #listPkgs {
82 list-style-type: none;
83 margin: 0;
84 padding: 0;
85 background-color: #f1f1f1;
86 }
87 #listPkgs li a {
88 display: block;
89 color: #000;
90 padding: 8px 16px;
91 text-decoration: none;
92 }
93 #listPkgs li a:hover {
94 background-color: #555;
95 color: #fff;
96 }
97
98 #logo {
99 width: 8em;
100 padding: 0.5em 1em;
101 }
102
103 #search {
104 width: 100%;
105 }
106
107 @media (prefers-color-scheme: dark) {
108 body{
109 background-color: #111;
110 color: #bbb;
14111 }
15112 a {
16 color: #2A6286;
113 color: #88f;
17114 }
18115 pre{
19 font-family:"Source Code Pro",monospace;
20 font-size:1em;
21 background-color:#F5F5F5;
22 padding:1em;
23 overflow-x: auto;
24 }
25 nav {
26 width: 10em;
27 position: fixed;
28 left: 0;
29 top: 0;
30 height: 100vh;
31 overflow: auto;
32 }
33 nav h2 {
34 font-size: 1.2em;
35 text-decoration: underline;
36 margin: 0;
37 padding: 0.5em 0;
38 text-align: center;
39 }
40 nav p {
41 margin: 0;
42 padding: 0;
43 text-align: center;
44 }
45 section {
46 margin-left: 10em;
47 }
48 #listNav {
49 list-style-type: none;
50 margin: 0.5em 0 0 0;
51 padding: 0;
52 overflow: hidden;
53 background-color: #333;
54 }
55 #listNav li {
56 float:left;
57 }
58 #listNav li a {
59 display: block;
60 color: #fff;
61 text-align: center;
62 padding: .5em .8em;
63 text-decoration: none;
64 }
65 #listNav li a:hover {
66 background-color: #111;
116 background-color:#2A2A2A;
67117 }
68 #listNav li a.active {
69 background-color: #4CAF50;
70 }
71
72118 #listPkgs {
73 list-style-type: none;
74 margin: 0;
75 padding: 0;
76 background-color: #f1f1f1;
119 background-color: #333;
77120 }
78121 #listPkgs li a {
79 display: block;
80 color: #000;
81 padding: 8px 16px;
82 text-decoration: none;
122 color: #fff;
83123 }
84124 #listPkgs li a:hover {
85 background-color: #555;
86 color: #fff;
87 }
88
89 #logo {
90 width: 8em;
91 padding: 0.5em 1em;
92 }
93
94 #search {
95 width: 100%;
96 }
97
98 @media (prefers-color-scheme: dark) {
99 body{
100 background-color: #111;
101 color: #bbb;
102 }
103 a {
104 color: #88f;
105 }
106 pre{
107 background-color:#2A2A2A;
108 }
109 #listPkgs {
110 background-color: #333;
111 }
112 #listPkgs li a {
113 color: #fff;
114 }
115 #listPkgs li a:hover {
116 background-color: #555;
117 color: #fff;
118 }
125 background-color: #555;
126 color: #fff;
119127 }
128 }
120129 </style>
121130 </head>
122131 <body>
......@@ -141,18 +150,25 @@
141150 <div id="fnProto" class="hidden">
142151 <pre id="fnProtoCode"></pre>
143152 </div>
153 <h1 id="hdrName" class="hidden"></h1>
144154 <div id="fnDocs" class="hidden"></div>
145 <div id="sectSearchResults" class="hidden"><ul id="listSearchResults"></ul></div>
146 <div id="sectSearchNoResults" class="hidden"><p>No search results.</p></div>
155 <div id="sectSearchResults" class="hidden">
156 <h2>Search Results</h2>
157 <ul id="listSearchResults"></ul>
158 </div>
159 <div id="sectSearchNoResults" class="hidden">
160 <h2>No Results Found</h2>
161 <p>Press escape to exit search and then '?' to see more options.</p>
162 </div>
147163 <div id="sectTypes" class="hidden">
148 <h2>Types</h2>
149 <ul id="listTypes">
150 </ul>
164 <h2>Types</h2>
165 <ul id="listTypes">
166 </ul>
151167 </div>
152168 <div id="sectFns" class="hidden">
153 <h2>Functions</h2>
154 <ul id="listFns">
155 </ul>
169 <h2>Functions</h2>
170 <ul id="listFns">
171 </ul>
156172 </div>
157173 </section>
158174 <script src="data.js"></script>
lib/std/special/docs/main.js+10-5
......@@ -19,6 +19,7 @@
1919 var domListInfo = document.getElementById("listInfo");
2020 var domTdTarget = document.getElementById("tdTarget");
2121 var domTdZigVer = document.getElementById("tdZigVer");
22 var domHdrName = document.getElementById("hdrName");
2223
2324 var searchTimer = null;
2425 var escapeHtmlReplacements = { "&": "&amp;", '"': "&quot;", "<": "&lt;", ">": "&gt;" };
......@@ -73,7 +74,9 @@
7374 domSectTypes.classList.add("hidden");
7475 domSectFns.classList.add("hidden");
7576 domSectSearchResults.classList.add("hidden");
77 domSectSearchNoResults.classList.add("hidden");
7678 domSectInfo.classList.add("hidden");
79 domHdrName.classList.add("hidden");
7780
7881 renderTitle();
7982 renderInfo();
......@@ -250,8 +253,10 @@
250253 }
251254
252255 function renderType(typeObj) {
253 domFnDocs.innerText = zigAnalysis.typeKinds[typeObj.kind] + ": " + typeObj.name;
254 domFnDocs.classList.remove("hidden");
256 if (typeObj.name != null && typeObj.name != "") {
257 domHdrName.innerText = zigAnalysis.typeKinds[typeObj.kind] + " " + typeObj.name;
258 domHdrName.classList.remove("hidden");
259 }
255260 }
256261
257262 function renderContainer(container) {
......@@ -363,13 +368,13 @@
363368 nonSearchPart = nonSearchAndSearchParts[0];
364369 } else {
365370 nonSearchPart = nonSearchAndSearchParts[0];
366 curNavSearch = nonSearchAndSearchParts[1];
371 curNavSearch = decodeURIComponent(nonSearchAndSearchParts[1]);
367372 }
368373
369374 var parts = nonSearchPart.split(";");
370 curNav.pkgNames = parts[0].split(".");
375 curNav.pkgNames = decodeURIComponent(parts[0]).split(".");
371376 if (parts[1] != null) {
372 curNav.declNames = parts[1].split(".");
377 curNav.declNames = decodeURIComponent(parts[1]).split(".");
373378 }
374379 }
375380 if (domSearch.value !== curNavSearch) {