Skip to content

Make it Fastboot compatible #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cibernox merged 1 commit into from
Feb 1, 2016
Merged

Make it Fastboot compatible #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# compiled output
/dist
/fastboot-dist
/tmp

# dependencies
Expand Down
3 changes: 1 addition & 2 deletions .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"predef": [
"document",
"window",
"self",
"-Promise"
],
"browser": true,
Expand Down
45 changes: 25 additions & 20 deletions addon/components/basic-dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import layout from '../templates/components/basic-dropdown';
import getOwner from 'ember-getowner-polyfill';

const { Component, run, computed } = Ember;
const MutObserver = window.MutationObserver || window.WebKitMutationObserver;
const MutObserver = self.window.MutationObserver || self.window.WebKitMutationObserver;

export default Component.extend({
layout: layout,
Expand All @@ -19,8 +19,6 @@ export default Component.extend({
// Lifecycle hooks
init() {
this._super(...arguments);
const rootSelector = Ember.testing ? '#ember-testing' : getOwner(this).lookup('application:main').rootElement;
this.appRoot = document.querySelector(rootSelector);
this.handleRootMouseDown = this.handleRootMouseDown.bind(this);
this.handleRepositioningEvent = this.handleRepositioningEvent.bind(this);
this.repositionDropdown = this.repositionDropdown.bind(this);
Expand All @@ -44,6 +42,10 @@ export default Component.extend({

// CPs
dropdownPosition: computed.deprecatingAlias('verticalPosition', { id: 'basic-dropdown-position', until: 0.8 }),
appRoot: computed(function() {
const rootSelector = Ember.testing ? '#ember-testing' : getOwner(this).lookup('application:main').rootElement;
return self.document.querySelector(rootSelector);
}),
tabIndex: computed('disabled', function() {
return !this.get('disabled') ? (this.get('tabindex') || '0') : null;
}),
Expand Down Expand Up @@ -103,7 +105,7 @@ export default Component.extend({
if (e) { e.preventDefault(); }
this.set('publicAPI.isOpen', true);
this.addGlobalEventsTimer = run.scheduleOnce('afterRender', this, this.addGlobalEvents);
this.repositionDropdownTimer = run.scheduleOnce('afterRender', this, this.repositionDropdown);
this.repositionDropdownTimer = run.scheduleOnce('afterRender', this, this.handleRepositioningEvent);
let onOpen = this.get('onOpen');
if (onOpen) { onOpen(this.get('publicAPI'), e); }
},
Expand Down Expand Up @@ -139,11 +141,12 @@ export default Component.extend({
},

repositionDropdown() {
if (!self.document) { return; }
run.join(this, this._performReposition);
},

handleRootMouseDown(e) {
if (!this.element.contains(e.target) && !this.appRoot.querySelector('.ember-basic-dropdown-content').contains(e.target)) {
if (!this.element.contains(e.target) && !this.get('appRoot').querySelector('.ember-basic-dropdown-content').contains(e.target)) {
this.close(e, true);
}
},
Expand All @@ -153,50 +156,52 @@ export default Component.extend({
},

addGlobalEvents() {
this.appRoot.addEventListener('mousedown', this.handleRootMouseDown, true);
window.addEventListener('scroll', this.handleRepositioningEvent);
window.addEventListener('resize', this.handleRepositioningEvent);
window.addEventListener('orientationchange', this.handleRepositioningEvent);
if (!self.document) { return; }
this.get('appRoot').addEventListener('mousedown', this.handleRootMouseDown, true);
self.window.addEventListener('scroll', this.handleRepositioningEvent);
self.window.addEventListener('resize', this.handleRepositioningEvent);
self.window.addEventListener('orientationchange', this.handleRepositioningEvent);
if (MutObserver) {
this.mutationObserver = new MutObserver(mutations => {
if (mutations[0].addedNodes.length || mutations[0].removedNodes.length) {
this.repositionDropdown();
}
});
run.schedule('afterRender', this, function() {
const dropdown = this.appRoot.querySelector('.ember-basic-dropdown-content');
const dropdown = this.get('appRoot').querySelector('.ember-basic-dropdown-content');
if (!dropdown) { return; }
this.mutationObserver.observe(dropdown, { childList: true, subtree: true });
});
} else {
run.schedule('afterRender', this, function() {
const dropdown = this.appRoot.querySelector('.ember-basic-dropdown-content');
const dropdown = this.get('appRoot').querySelector('.ember-basic-dropdown-content');
dropdown.addEventListener('DOMNodeInserted', this.repositionDropdown, false);
dropdown.addEventListener('DOMNodeRemoved', this.repositionDropdown, false);
});
}
},

removeGlobalEvents() {
this.appRoot.removeEventListener('mousedown', this.handleRootMouseDown, true);
window.removeEventListener('scroll', this.handleRepositioningEvent);
window.removeEventListener('resize', this.handleRepositioningEvent);
window.removeEventListener('orientationchange', this.handleRepositioningEvent);
if (!self.document) { return; }
this.get('appRoot').removeEventListener('mousedown', this.handleRootMouseDown, true);
self.window.removeEventListener('scroll', this.handleRepositioningEvent);
self.window.removeEventListener('resize', this.handleRepositioningEvent);
self.window.removeEventListener('orientationchange', this.handleRepositioningEvent);
if (MutObserver) {
if (this.mutationObserver) {
this.mutationObserver.disconnect();
this.mutationObserver = null;
}
} else {
let dropdown = this.appRoot.querySelector('.ember-basic-dropdown-content');
let dropdown = this.get('appRoot').querySelector('.ember-basic-dropdown-content');
dropdown.removeEventListener('DOMNodeInserted', this.repositionDropdown);
dropdown.removeEventListener('DOMNodeRemoved', this.repositionDropdown);
}
},

_performReposition() {
if (this.get('renderInPlace') || !this.get('publicAPI.isOpen')) { return; }
let dropdown = this.appRoot.querySelector('.ember-basic-dropdown-content');
let dropdown = this.get('appRoot').querySelector('.ember-basic-dropdown-content');
if (!dropdown) { return ;}
let verticalPositionStrategy = this.get('verticalPosition');
let trigger = this.element.querySelector('.ember-basic-dropdown-trigger');
Expand All @@ -205,7 +210,7 @@ export default Component.extend({
dropdown.style.width = `${triggerWidth}px`;
}
let { height: dropdownHeight, width: dropdownWidth } = dropdown.getBoundingClientRect();
let $window = Ember.$(window);
let $window = Ember.$(self.window);
let viewportTop = $window.scrollTop();
let top = topWithoutScroll + viewportTop;

Expand All @@ -216,7 +221,7 @@ export default Component.extend({
top = top + height;
this.set('_verticalPositionClass', 'ember-basic-dropdown--below');
} else { // auto
const viewportBottom = viewportTop + window.innerHeight;
const viewportBottom = viewportTop + self.window.innerHeight;
const enoughRoomBelow = top + height + dropdownHeight < viewportBottom;
const enoughRoomAbove = topWithoutScroll > dropdownHeight;

Expand All @@ -236,7 +241,7 @@ export default Component.extend({

if(['right', 'left'].indexOf(horizontalPositionStrategy) === -1) {
// horizontal auto
let viewportRight = $window.scrollLeft() + window.innerWidth;
let viewportRight = $window.scrollLeft() + self.window.innerWidth;
let roomForRight = viewportRight - left;
let roomForLeft = left;

Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@
"ember-cli-app-version": "^1.0.0",
"ember-cli-blanket": "0.6.0",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-fastboot": "0.3.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^1.2.1",
"ember-cli-sri": "^2.0.0",
"ember-cli-release": "1.0.0-beta.0",
"ember-cli-sass": "5.2.1",
"ember-cli-sri": "^2.0.0",
"ember-cli-uglify": "^1.2.0",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-disable-proxy-controllers": "^1.0.1",
Expand Down