Skip to content

Commit 629ccff

Browse files
authored
Cleanup fastboot PR (#81)
1 parent 657004b commit 629ccff

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

.jshintrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"predef": [
33
"document",
44
"window",
5-
"self",
65
"-Promise"
76
],
87
"browser": true,

addon/components/bm-menu-item.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Ember from 'ember';
22
import layout from '../templates/components/bm-menu-item';
33
import computedStyleFor from 'ember-burger-menu/computed/style-for';
4+
import isFastboot from 'ember-burger-menu/utils/is-fastboot';
45

56
const {
67
$,
@@ -20,9 +21,10 @@ export default Ember.Component.extend({
2021
style: computedStyleFor('menuItem').readOnly(),
2122

2223
index: computed('menuItems.[]', function() {
23-
if (!self.document) {
24-
return;
24+
if (isFastboot()) {
25+
return -1;
2526
}
27+
2628
let $item = this.$();
2729
return $item ? $('.bm-menu-item', $item.closest('.bm-menu')).index($item) : -1;
2830
}).readOnly(),

addon/components/burger-menu.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import computedStyleFor from 'ember-burger-menu/computed/style-for';
44
import SwipeSupportMixin from 'ember-burger-menu/mixins/swipe-support';
55
import State from 'ember-burger-menu/-private/state';
66
import DomMixin from 'ember-lifeline/mixins/dom';
7+
import isFastboot from 'ember-burger-menu/utils/is-fastboot';
78

89
const {
910
$,
@@ -47,9 +48,10 @@ export default Ember.Component.extend(DomMixin, SwipeSupportMixin, {
4748
},
4849

4950
setupEvents: on('didReceiveAttrs', observer('open', 'locked', function() {
50-
if (!self.document) {
51+
if (isFastboot()) {
5152
return;
5253
}
54+
5355
let methodName = (this.get('open') && !this.get('locked')) ? '_setupEvents' : '_teardownEvents';
5456
this._setupEventsTimer = run.scheduleOnce('afterRender', this, methodName);
5557
})),

addon/utils/is-fastboot.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/* global self */
2+
3+
export default function isFastboot() {
4+
return !self.document;
5+
}

0 commit comments

Comments
 (0)