-
-
Notifications
You must be signed in to change notification settings - Fork 333
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'miguelcobain/master' into update-grid-list
- Loading branch information
Showing
24 changed files
with
452 additions
and
342 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,47 +1,5 @@ | ||
import Ember from 'ember'; | ||
import BasicTrigger from 'ember-basic-dropdown/components/basic-dropdown/trigger'; | ||
const { computed } = Ember; | ||
|
||
export default BasicTrigger.extend({ | ||
tagName: 'md-autocomplete', | ||
attributeBindings: ['label:md-floating-label', 'disabled:disabled'], | ||
disabled: computed('disabledProxy', function() { | ||
return this.get('disabledProxy') ? this.get('disabledProxy') : undefined; | ||
}), | ||
|
||
// Chrome 51: setting tabindex=0 explicitly stops tab propogation to | ||
// other elements. We need to verify that other browsers behave as expected. | ||
tabIndex: computed('dropdown.disabled', 'tabindex', function() { | ||
let tabindex = this.get('tabindex'); | ||
|
||
// tabindex = falsy - don't set tabindex attr | ||
if (!tabindex || this.get('dropdown.disabled')) { | ||
return null; | ||
} | ||
return tabindex; | ||
}), | ||
|
||
addMandatoryHandlers() { | ||
if (this.get('isTouchDevice')) { | ||
this.element.addEventListener('touchstart', () => { | ||
document.body.addEventListener('touchmove', this._touchMoveHandler); | ||
}); | ||
this.element.addEventListener('touchend', (e) => { | ||
this.send('handleTouchEnd', e); | ||
}); | ||
} | ||
this.element.addEventListener('mousedown', (e) => this.send('handleMousedown', e)); | ||
this.element.addEventListener('keydown', (e) => this.send('handleKeyDown', e)); | ||
}, | ||
|
||
actions: { | ||
|
||
handleMousedown() { | ||
let dropdown = this.get('dropdown'); | ||
if (dropdown.disabled) { | ||
return; | ||
} | ||
this.stopTextSelectionUntilMouseup(); | ||
} | ||
} | ||
attributeBindings: ['label:md-floating-label', 'disabled:disabled'] | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 0 additions & 26 deletions
26
addon/templates/components/paper-autocomplete-dropdown.hbs
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.