Skip to content

Commit b6178fe

Browse files
committed
Revert "feat: sticky method, property, and event headers (ember-learn#336)"
This reverts commit f885e76.
1 parent c5afe20 commit b6178fe

File tree

6 files changed

+21
-62
lines changed

6 files changed

+21
-62
lines changed

app/components/class-field-description.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import Component from '@ember/component';
22
import { inject as service } from '@ember/service';
33
import { computed } from '@ember/object';
4-
import { gt } from '@ember/object/computed';
54

65
export default Component.extend({
76
legacyModuleMappings: service(),
@@ -10,17 +9,6 @@ export default Component.extend({
109
return this.legacyModuleMappings.hasFunctionMapping(this.get('field.name'), this.get('field.class'));
1110
}),
1211

13-
stickyEnabled: gt('ownHeight', 200),
14-
15-
didInsertElement() {
16-
this._super(...arguments);
17-
this.setOwnHeight(this.element);
18-
},
19-
20-
setOwnHeight(element) {
21-
this.set('ownHeight', element.clientHeight);
22-
},
23-
2412
/**
2513
* Callback for updating the anchor with the field name that was clicked by a user.
2614
*

app/styles/components/_class-field-desc.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717
font-size: $base-font-size;
1818
}
1919

20-
.sticky-element--sticky .class-field-description--link {
21-
margin: 0 -1.45em;
22-
background-color: #FDFDFD;
23-
padding: 0.4em 1.4em;
24-
box-shadow: rgba(0, 0, 0, 0.4) 0 1px 4px -1px;
25-
transition: 0.3s top, 0.3s box-shadow, 0.3s padding;
26-
}
27-
2820
.class-field-description--link .return-type,
2921
.return .return-type,
3022
.parameter .parameter-type {
@@ -62,7 +54,6 @@ h3 .access{
6254

6355
.method, .property, .event {
6456
border-bottom: $base-border;
65-
position: relative;
6657

6758
.method-name, .property-name, .event-name {
6859
font-family: $monospace-font-family;

app/styles/components/_highlight.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
margin: $small-spacing 0 $large-spacing;
99
overflow: hidden;
1010
position: relative;
11-
z-index: -1;
1211

1312
&.handlebars {
1413
.inline,

app/templates/components/class-field-description.hbs

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
<section class="{{type}}">
2-
{{#sticky-element top=0 bottom=0 enabled=this.stickyEnabled}}
3-
<h3 class="class-field-description--link" data-anchor="{{field.name}}" role="link" onclick={{action updateAnchor field.name}}>
4-
<a class="anchor">
5-
{{svg-jar 'fa-link' class="class-field-description--link-hover" width="20px" height="20px"}}
6-
</a>
7-
<span class="{{type}}-name">{{field.name}}</span>
8-
{{#if field.params}}
9-
<span class="args">
10-
({{join ", " (map-by "name" field.params)}})
11-
</span>
12-
{{/if}}
13-
{{#if field.return}}
14-
<span class="return-type">{{field.return.type}}</span>
15-
{{/if}}
16-
{{#if field.access}}
17-
<span class="access">{{field.access}}</span>
18-
{{/if}}
19-
{{#if field.deprecated}}
20-
<span class="access">deprecated</span>
21-
{{/if}}
22-
</h3>
23-
{{/sticky-element}}
2+
<h3 class="class-field-description--link" data-anchor="{{field.name}}" role="link" onclick={{action updateAnchor field.name}}>
3+
<a class="anchor">
4+
{{svg-jar 'fa-link' class="class-field-description--link-hover" width="20px" height="20px"}}
5+
</a>
6+
<span class="{{type}}-name">{{field.name}}</span>
7+
{{#if field.params}}
8+
<span class="args">
9+
({{join ", " (map-by "name" field.params)}})
10+
</span>
11+
{{/if}}
12+
{{#if field.return}}
13+
<span class="return-type">{{field.return.type}}</span>
14+
{{/if}}
15+
{{#if field.access}}
16+
<span class="access">{{field.access}}</span>
17+
{{/if}}
18+
{{#if field.deprecated}}
19+
<span class="access">deprecated</span>
20+
{{/if}}
21+
</h3>
2422
{{#if model.module}}
2523
<div class="attributes">
2624
<div class="attribute">

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
"ember-route-action-helper": "^2.0.5",
8888
"ember-sinon": "^2.1.0",
8989
"ember-source": "~3.4.0",
90-
"ember-sticky-element": "^0.2.3",
9190
"ember-styleguide": "^2.3.1",
9291
"ember-svg-jar": "^1.2.2",
9392
"ember-test-selectors": "^2.0.0",

yarn.lock

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5174,14 +5174,7 @@ ember-in-element-polyfill@^0.1.2:
51745174
ember-cli-version-checker "^2.1.0"
51755175
ember-wormhole "^0.5.4"
51765176

5177-
ember-in-viewport@~3.0.0:
5178-
version "3.0.3"
5179-
resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.0.3.tgz#49c60b52525795246761742ed4495ad6cd9bf70d"
5180-
integrity sha512-Iw8qquApABdrP9xA8hJFaYAxz/iOGLJ0Acq4QptemEnpsHcQqAET/SKL/A1fbtDGQAVtB5+bULaJcsrzRMCteg==
5181-
dependencies:
5182-
ember-cli-babel "^6.6.0"
5183-
5184-
ember-inflector@^2.0.1:
5177+
ember-inflector@^2.0.0, ember-inflector@^2.0.1:
51855178
version "2.1.0"
51865179
resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.1.0.tgz#afcb92d022a4eab58f08ff4578eafc3a1de2d09b"
51875180
dependencies:
@@ -5376,15 +5369,6 @@ ember-source@~3.4.0:
53765369
jquery "^3.3.1"
53775370
resolve "^1.6.0"
53785371

5379-
ember-sticky-element@^0.2.3:
5380-
version "0.2.3"
5381-
resolved "https://registry.yarnpkg.com/ember-sticky-element/-/ember-sticky-element-0.2.3.tgz#39702e0fc0f04905a7b34add61a85a9186d3d16b"
5382-
integrity sha512-AtKkM8zh6LK5FsPxtsDywUSodGk5c2AI03vcgk995dC5Z7DG4XLJoAwV0FZM5RYnymnYEJvOs6VTcIM8uwcX5w==
5383-
dependencies:
5384-
ember-cli-babel "^6.8.2"
5385-
ember-cli-htmlbars "^2.0.1"
5386-
ember-in-viewport "~3.0.0"
5387-
53885372
ember-styleguide@^2.3.1:
53895373
version "2.5.0"
53905374
resolved "https://registry.yarnpkg.com/ember-styleguide/-/ember-styleguide-2.5.0.tgz#f0a43630c3adf527f966ae77af850a411e86e6b6"

0 commit comments

Comments
 (0)