Skip to content

Commit 1ee553d

Browse files
jcardonadcdevjcardonadcdev
committed
add labels for the types of nav elements
1 parent 68353e3 commit 1ee553d

File tree

6 files changed

+121
-74
lines changed

6 files changed

+121
-74
lines changed

‎.gitignore‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
1+
#npm installed files
12
node_modules/
2-
demo/dist/
3+
4+
#directory generated by demo build
5+
demo/dist/
6+
7+
#Jetbrains project files
8+
.idea/
9+
10+
#Fork-specific sample files
11+
demo/sample/ConstructorModule.js
12+
demo/sample/noConstructorUtils.js

‎Gruntfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ module.exports = function (grunt) {
108108
'grunt-contrib-copy',
109109
'grunt-contrib-clean',
110110
'grunt-contrib-less',
111-
'grunt-jsdoc',
111+
'grunt-jsdoc'
112112
].forEach(function (taskName) {
113113
grunt.loadNpmTasks(taskName);
114114
});

‎less/navigation.less‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
}
3030
}
3131

32+
.typeHeading {
33+
font: 600 1.1em Helvetica;
34+
color: #f5f5f5;
35+
border-bottom: 1px solid #333;
36+
}
37+
3238
.search {
3339
padding: 10px 15px;
3440

@@ -49,7 +55,7 @@
4955
li.item {
5056
margin-bottom: 8px;
5157
padding-bottom: 8px;
52-
border-bottom: 1px solid #333;
58+
/*border-bottom: 1px solid #333;*/
5359

5460
a {
5561
color: #bbb;

‎publish.js‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,12 @@ function attachModuleSymbols(doclets, modules) {
200200
* @return {string} The HTML for the navigation sidebar.
201201
*/
202202
function buildNav(members) {
203-
var nav = [];
203+
var nav = {};
204204

205205
if (members.namespaces.length) {
206+
var namespaces = [];
206207
_.each(members.namespaces, function (v) {
207-
nav.push({
208+
namespaces.push({
208209
type: 'namespace',
209210
longname: v.longname,
210211
name: v.name,
@@ -226,11 +227,14 @@ function buildNav(members) {
226227
})
227228
});
228229
});
230+
231+
nav.Namespaces = namespaces;
229232
}
230233

231234
if (members.classes.length) {
235+
var classes = [];
232236
_.each(members.classes, function (v) {
233-
nav.push({
237+
classes.push({
234238
type: 'class',
235239
longname: v.longname,
236240
name: v.name,
@@ -252,11 +256,14 @@ function buildNav(members) {
252256
})
253257
});
254258
});
259+
260+
nav.Classes = classes;
255261
}
256262

257263
if (members.modules.length) {
264+
var modules = [];
258265
_.each(members.modules, function(v) {
259-
nav.push({
266+
modules.push({
260267
type: 'module',
261268
longname: v.longname,
262269
name: v.name,
@@ -278,6 +285,8 @@ function buildNav(members) {
278285
})
279286
});
280287
});
288+
289+
nav.Modules = modules;
281290
}
282291

283292
return nav;

‎static/styles/jaguar.css‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ li {
3939
.navigation .applicationName a {
4040
color: #fff;
4141
}
42+
.navigation .typeHeading {
43+
font: 600 1.1em Helvetica;
44+
color: #f5f5f5;
45+
border-bottom: 1px solid #333;
46+
}
4247
.navigation .search {
4348
padding: 10px 15px;
4449
}
@@ -56,7 +61,7 @@ li {
5661
.navigation li.item {
5762
margin-bottom: 8px;
5863
padding-bottom: 8px;
59-
border-bottom: 1px solid #333;
64+
/*border-bottom: 1px solid #333;*/
6065
}
6166
.navigation li.item a {
6267
color: #bbb;
@@ -343,6 +348,18 @@ li {
343348
margin-bottom: 5px;
344349
list-style-type: disc;
345350
}
351+
.main .class-description ol,
352+
.main .class-description ul {
353+
margin-left: 25px;
354+
}
355+
.main .class-description ol > li {
356+
list-style-type: decimal;
357+
margin-bottom: 5px;
358+
}
359+
.main .class-description ul > li {
360+
margin-bottom: 5px;
361+
list-style-type: disc;
362+
}
346363
footer {
347364
margin: 15px 0;
348365
padding-top: 15px;

‎tmpl/navigation.tmpl‎

Lines changed: 71 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -9,73 +9,78 @@ var self = this;
99
</div>
1010
<ul class="list">
1111
<?js
12-
this.nav.forEach(function (item) {
12+
Object.keys(this.nav).forEach(function(key) {
1313
?>
14-
<li class="item" data-name="<?js= item.longname ?>">
15-
<span class="title">
16-
<?js= self.linkto(item.longname, item.longname) ?>
17-
<?js if (item.type === 'namespace') { ?>
18-
<span class="static">static</span>
19-
<?js } ?>
20-
</span>
21-
<ul class="members itemMembers">
22-
<?js
23-
if (item.members.length) {
24-
?>
25-
<span class="subtitle">Members</span>
26-
<?js
27-
item.members.forEach(function (v) {
28-
?>
29-
<li data-name="<?js= v.longname ?>"><?js= self.linkto(v.longname, v.name) ?></li>
30-
<?js
31-
});
32-
}
33-
?>
34-
</ul>
35-
<ul class="typedefs itemMembers">
36-
<?js
37-
if (item.typedefs.length) {
38-
?>
39-
<span class="subtitle">Typedefs</span>
40-
<?js
41-
item.typedefs.forEach(function (v) {
42-
?>
43-
<li data-name="<?js= v.longname ?>"><?js= self.linkto(v.longname, v.name) ?></li>
44-
<?js
45-
});
46-
}
47-
?>
48-
</ul>
49-
<ul class="methods itemMembers">
50-
<?js
51-
if (item.methods.length) {
52-
?>
53-
<span class="subtitle">Methods</span>
54-
<?js
14+
<h3 class="typeHeading"><?js= key ?></h3>
15+
<?js
16+
this.nav[key].forEach(function (item) {
17+
?>
18+
<li class="item" data-name="<?js= item.longname ?>">
19+
<span class="title">
20+
<?js= self.linkto(item.longname, item.longname) ?>
21+
<?js if (item.type === 'namespace') { ?>
22+
<span class="static">static</span>
23+
<?js } ?>
24+
</span>
25+
<ul class="members itemMembers">
26+
<?js
27+
if (item.members.length) {
28+
?>
29+
<span class="subtitle">Members</span>
30+
<?js
31+
item.members.forEach(function (v) {
32+
?>
33+
<li data-name="<?js= v.longname ?>"><?js= self.linkto(v.longname, v.name) ?></li>
34+
<?js
35+
});
36+
}
37+
?>
38+
</ul>
39+
<ul class="typedefs itemMembers">
40+
<?js
41+
if (item.typedefs.length) {
42+
?>
43+
<span class="subtitle">Typedefs</span>
44+
<?js
45+
item.typedefs.forEach(function (v) {
46+
?>
47+
<li data-name="<?js= v.longname ?>"><?js= self.linkto(v.longname, v.name) ?></li>
48+
<?js
49+
});
50+
}
51+
?>
52+
</ul>
53+
<ul class="methods itemMembers">
54+
<?js
55+
if (item.methods.length) {
56+
?>
57+
<span class="subtitle">Methods</span>
58+
<?js
5559

56-
item.methods.forEach(function (v) {
57-
?>
58-
<li data-name="<?js= v.longname ?>"><?js= self.linkto(v.longname, v.name) ?></li>
59-
<?js
60-
});
61-
}
62-
?>
63-
</ul>
64-
<ul class="events itemMembers">
65-
<?js
66-
if (item.events.length) {
67-
?>
68-
<span class="subtitle">Events</span>
69-
<?js
70-
item.events.forEach(function (v) {
71-
?>
72-
<li data-name="<?js= v.longname ?>"><?js= self.linkto(v.longname, v.name) ?></li>
73-
<?js
74-
});
75-
}
76-
?>
77-
</ul>
78-
</li>
79-
<?js }); ?>
60+
item.methods.forEach(function (v) {
61+
?>
62+
<li data-name="<?js= v.longname ?>"><?js= self.linkto(v.longname, v.name) ?></li>
63+
<?js
64+
});
65+
}
66+
?>
67+
</ul>
68+
<ul class="events itemMembers">
69+
<?js
70+
if (item.events.length) {
71+
?>
72+
<span class="subtitle">Events</span>
73+
<?js
74+
item.events.forEach(function (v) {
75+
?>
76+
<li data-name="<?js= v.longname ?>"><?js= self.linkto(v.longname, v.name) ?></li>
77+
<?js
78+
});
79+
}
80+
?>
81+
</ul>
82+
</li>
83+
<?js }); ?>
84+
<?js }.bind(this)); ?>
8085
</ul>
8186
</div>

0 commit comments

Comments
 (0)