javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use contentElement for aside

Browse Source
This commit is contained in:
Max Lynch
2015-06-18 17:50:12 -05:00
parent defa91cd1d
commit 6c63b99e71
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ionic/components/aside/aside.js
View File

@@ -41,6 +41,7 @@ export class Aside {
this.domElement.setAttribute('type', this.type);
console.log('Aside content', this.content);
this.contentElement = (this.content instanceof Node) ? this.content : this.content.domElement;
this.config = Aside.config.invoke(this)
this.gestureDelegate = this.config.getDelegate('gesture');
@@ -53,14 +54,7 @@ export class Aside {
}
getContentElement() {
if(!this.content && !this.content.domElement) {
console.error('Aside: make sure to specify a content target using #var on the element');
return null;
}
if(this.content instanceof Node) {
return this.content;
}
return this.content.domElement;
return this.contentElement;
}
setOpenAmt(v) {

8
ionic/components/aside/extensions/types.js
View File

@@ -15,15 +15,15 @@ const asideManipulator = {
}
const contentManipulator = {
setSliding(sliding) {
this.aside.content.domElement.classList[sliding ? 'add' : 'remove']('no-transition');
this.aside.contentElement.classList[sliding ? 'add' : 'remove']('no-transition');
},
setOpen(open) {
this.aside.content.domElement.classList[open ? 'add' : 'remove'](
this.aside.contentElement.classList[open ? 'add' : 'remove'](
`aside-open-${this.aside.side}`
)
},
setTransform(t) {
this.aside.content.domElement.style[CSS.transform] = t;
this.aside.contentElement.style[CSS.transform] = t;
}
}
@@ -33,7 +33,7 @@ export class AsideType {
//FIXME(ajoslin): have to wait for for bindings to apply in a component
setTimeout(() => {
aside.content.domElement.classList.add('aside-content')
aside.contentElement.classList.add('aside-content')
})
}
}