Skip to content

Commit b8c6ec6

Browse files
authored
Merge pull request #956 from ember-learn/kg-website-redesign
2 parents 0ec87c8 + 9d74f33 commit b8c6ec6

File tree

28 files changed

+270
-144
lines changed

28 files changed

+270
-144
lines changed

app/components/class-field-description.hbs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
{{! template-lint-disable no-invalid-interactive }}
2-
<section class='{{@type}}'>
3-
<h3 id='{{@field.name}}'>
4-
<span class='{{@type}}-name'>{{@field.name}}</span>
5-
{{#if @field.params}}
6-
<span class='args'>
7-
({{join ', ' (map-by 'name' @field.params)}})
2+
<section class='class-field-description {{@type}}'>
3+
<h3 id='{{@field.name}}' class="class-field-description--header">
4+
<span class="signature">
5+
<span class='{{@type}}-name'>
6+
{{@field.name}}
87
</span>
9-
{{/if}}
10-
{{#if @field.return}}
11-
<span class='return-type'>{{@field.return.type}}</span>
12-
{{/if}}
8+
{{#if @field.params}}(<span class='args'>{{join ', ' (map-by 'name' @field.params)}}</span>){{/if}}
9+
{{#if @field.return}}
10+
: <span class='return-type'>{{@field.return.type}}</span>
11+
{{/if}}
12+
</span>
1313
{{#if @field.access}}
1414
<span class='access'>{{@field.access}}</span>
1515
{{/if}}
1616
{{#if @field.deprecated}}
1717
<span class='access'>deprecated</span>
1818
{{/if}}
19-
{{!-- TODO: Fix this link for a11y --}}
20-
<a class='class-field-description--link' href="#{{@field.name}}">
21-
{{svg-jar 'link' width='20px' height='20px'}}
19+
<a class='class-field-description--link' href="#{{@field.name}}" aria-label="Jump to {{@field.name}}">
20+
{{svg-jar 'link' width='20px' height='20px' aria-hidden='true'}}
2221
</a>
2322
</h3>
2423
{{#if @model.module}}

app/components/events.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<ApiIndexFilter @model={{@model}} @filterData={{@filterData}} as |filteredModel|>
22
{{#each filteredModel.events as |event|}}
3-
<ClassFieldDescription @type="event" @field={{event}} @model={{this.model}} />
3+
<ClassFieldDescription @type="event" @field={{event}} @model={{@model}} />
44
{{/each}}
55
</ApiIndexFilter>

app/components/methods.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<ApiIndexFilter @model={{@model}} @filterData={{@filterData}} as |filteredModel|>
22
{{#each filteredModel.methods as |method|}}
3-
<ClassFieldDescription @type="method" @field={{method}} @model={{this.model}} />
3+
<ClassFieldDescription @type="method" @field={{method}} @model={{@model}} />
44
{{/each}}
55
</ApiIndexFilter>

app/components/properties.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<ApiIndexFilter @model={{@model}} @filterData={{@filterData}} as |filteredModel|>
22
{{#each filteredModel.properties as |property|}}
3-
<ClassFieldDescription @type="property" @field={{property}} @model={{this.model}} />
3+
<ClassFieldDescription @type="property" @field={{property}} @model={{@model}} />
44
{{/each}}
55
</ApiIndexFilter>

app/controllers/events.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

app/controllers/methods.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

app/controllers/project-version.js

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ export default class ProjectVersionController extends Controller {
2525
@controller('project-version.classes.class') classController;
2626
@controller('project-version.modules.module') moduleController;
2727
@controller('project-version.namespaces.namespace') namespaceController;
28-
@controller('project-version.classes.class.methods') methodsController;
29-
@controller('project-version.classes.class.events') eventsController;
30-
@controller('project-version.classes.class.properties') propertiesController;
3128

3229
@alias('filterData.sideNav.showPrivate')
3330
showPrivateClasses;
@@ -159,39 +156,6 @@ export default class ProjectVersionController extends Controller {
159156
endingRoute = `namespaces/${namespaceName}`;
160157
break;
161158
}
162-
case 'project-version.classes.class.methods': {
163-
let className = this._getEncodedNameForCurrentClass();
164-
endingRoute = `classes/${className}/methods`;
165-
break;
166-
}
167-
case 'project-version.classes.class.events': {
168-
let className = this._getEncodedNameForCurrentClass();
169-
endingRoute = `classes/${className}/events`;
170-
break;
171-
}
172-
case 'project-version.classes.class.properties': {
173-
let className = this._getEncodedNameForCurrentClass();
174-
endingRoute = `classes/${className}/properties`;
175-
break;
176-
}
177-
case 'project-version.classes.class.methods.method': {
178-
let className = this._getEncodedNameForCurrentClass();
179-
let methodName = this.methodsController.anchor;
180-
endingRoute = `classes/${className}/methods/${methodName}?anchor=${methodName}`;
181-
break;
182-
}
183-
case 'project-version.classes.class.events.event': {
184-
let className = this._getEncodedNameForCurrentClass();
185-
let eventName = this.eventsController.anchor;
186-
endingRoute = `classes/${className}/events/${eventName}?anchor=${eventName}`;
187-
break;
188-
}
189-
case 'project-version.classes.class.properties.property': {
190-
let className = this._getEncodedNameForCurrentClass();
191-
let propertyName = this.propertiesController.anchor;
192-
endingRoute = `classes/${className}/properties/${propertyName}?anchor=${propertyName}`;
193-
break;
194-
}
195159
default:
196160
endingRoute = '';
197161
break;

app/controllers/project-version/classes/class/events.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/controllers/project-version/classes/class/index.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

app/controllers/project-version/classes/class/methods.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)