forked from adopted-ember-addons/ember-paper
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'adf876be15ede06e4e8def87a5430259c4951a57' into wow
* commit 'adf876be15ede06e4e8def87a5430259c4951a57': (24 commits) fix paper-item tests dummy app: Adjust sidenav snippet to conform to indentation standard. dummy app: Correct sidenav snippet to avoid conflict with dialog snippet. dummy app: bump ember-cli-github-pages to 0.1.0 as required for "destination" support. fix table scroll on mobile. fix inner sidenav container on mobile fix card page on mobile stop propagation of expand click events Adjusted `ember-css-transitions` dependency to a tagged release. Fixes query linear progress to demo switch from query to determinate. (adopted-ember-addons#391) fix didInitAttrs deprecations use yielded action added tests fix for issue adopted-ember-addons#378 (adopted-ember-addons#390) changed order of css modifications to match AM (adopted-ember-addons#386) Allow null or undefined errors initialization (adopted-ember-addons#389) allow lockedOpen to lock to a boolean improve sidenav docs update changelog use paper-toolbar-tools make sidenavs private. sidenav-toggle no longer gets the lockedOpen value. added some guards on the lockedOpen changes ...
- Loading branch information
Showing
53 changed files
with
757 additions
and
353 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 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
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 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
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 |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import Ember from 'ember'; | ||
const { Component } = Ember; | ||
|
||
export default Component.extend({ | ||
classNames: ['flex', 'layout-row'], | ||
attributeBindings: ['style'], | ||
style: Ember.String.htmlSafe('overflow: hidden') | ||
}); |
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 |
---|---|---|
@@ -0,0 +1,92 @@ | ||
import Ember from 'ember'; | ||
import TransitionMixin from 'ember-css-transitions/mixins/transition-mixin'; | ||
|
||
const { Component, inject, computed, $, run } = Ember; | ||
|
||
export default Component.extend(TransitionMixin, { | ||
tagName: 'md-sidenav', | ||
attributeBindings: ['tabindex'], | ||
classNameBindings: ['positionClass'], | ||
transitionTriggers: ['isLockedOpen:md-locked-open', 'closed:md-closed'], | ||
|
||
constants: inject.service(), | ||
paperSidenav: inject.service(), | ||
|
||
name: 'default', | ||
position: 'left', | ||
lockedOpen: 'gt-sm', | ||
closed: true, | ||
closeOnClick: true, | ||
tabindex: -1, | ||
|
||
positionClass: computed('position', function() { | ||
return `md-sidenav-${this.get('position')}`; | ||
}), | ||
|
||
init() { | ||
// need to updateLockedOpen() first because otherwise the transition classes | ||
// would be applied due to transition mixin's `init` | ||
this.updateLockedOpen(); | ||
this._super(...arguments); | ||
this.get('paperSidenav').register(this.get('name'), this); | ||
}, | ||
|
||
didInsertElement() { | ||
this._super(...arguments); | ||
$(window).on(`resize.${this.elementId}`, run.bind(this, 'updateLockedOpen')); | ||
}, | ||
|
||
willDestroyElement() { | ||
this._super(...arguments); | ||
$(window).off(`resize.${this.elementId}`); | ||
this.get('paperSidenav').unregister(this.get('name'), this); | ||
}, | ||
|
||
updateLockedOpen() { | ||
let lockedOpen = this.get('lockedOpen'); | ||
let isLockedOpen; | ||
|
||
// if `true` or `false` is specified, always/never "lock open" | ||
// otherwise proceed with normal matchMedia test | ||
if (typeof lockedOpen === 'boolean') { | ||
isLockedOpen = lockedOpen; | ||
} else { | ||
let mediaQuery = this.get('constants').MEDIA[lockedOpen] || lockedOpen; | ||
isLockedOpen = window.matchMedia(mediaQuery).matches; | ||
} | ||
|
||
if (this.get('isLockedOpen') !== isLockedOpen) { | ||
this.set('isLockedOpen', isLockedOpen); | ||
|
||
// if sidenav is open and we enter lockedOpen, | ||
// make the sidenav enter the "closed" state | ||
if (!this.get('closed') && isLockedOpen) { | ||
this.sendAction('onToggle', false); | ||
} | ||
} | ||
}, | ||
|
||
click() { | ||
if (this.get('closeOnClick') && !this.get('isLockedOpen')) { | ||
this.sendAction('onToggle', false); | ||
} | ||
}, | ||
|
||
open() { | ||
if (this.get('closed') && this.get('isLockedOpen')) { | ||
this.sendAction('onToggle', true); | ||
} | ||
}, | ||
|
||
close() { | ||
if (!this.get('closed') && !this.get('isLockedOpen')) { | ||
this.sendAction('onToggle', false); | ||
} | ||
}, | ||
|
||
toggle() { | ||
if (!this.get('isLockedOpen')) { | ||
this.sendAction('onToggle', this.get('closed')); | ||
} | ||
} | ||
}); |
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,27 +1,16 @@ | ||
import Ember from 'ember'; | ||
import PaperNavContainer from './paper-nav-container'; | ||
const { Component, inject } = Ember; | ||
|
||
export default Ember.Component.extend({ | ||
tagName: 'div', | ||
export default Component.extend({ | ||
|
||
navContainer: Ember.computed(function() { | ||
return this.nearestOfType(PaperNavContainer); | ||
}), | ||
tagName: '', | ||
|
||
actions: { | ||
toggleMenu() { | ||
this.get('navContainer').get('sideBar').send('toggleMenu'); | ||
} | ||
}, | ||
name: 'default', | ||
|
||
didInsertElement() { | ||
this._super(...arguments); | ||
if (this.get('navContainer')) { | ||
let lockedOpen = this.get('navContainer').get('sideBar').get('locked-open'); | ||
if (lockedOpen) { | ||
this.$().attr(`hide-${lockedOpen}`, true); | ||
} | ||
} | ||
paperSidenav: inject.service(), | ||
|
||
toggle() { | ||
this.get('paperSidenav').toggle(this.get('name')); | ||
} | ||
|
||
}); |
Oops, something went wrong.