From ae5db834cde36a7ad0c961a5e433ed8d77689642 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 22 Mar 2015 17:03:08 -0600 Subject: [PATCH] remove unused behaviors folder --- example-bootstrap.js | 1 + playground/basic-example/main.js | 6 +- src/components.js | 7 - src/components/aside/aside.js | 22 ++-- .../aside/behaviors/direction/direction.js | 120 ------------------ .../aside/behaviors/direction/directions.scss | 0 6 files changed, 15 insertions(+), 141 deletions(-) delete mode 100644 src/components.js delete mode 100644 src/components/aside/behaviors/direction/direction.js delete mode 100644 src/components/aside/behaviors/direction/directions.scss diff --git a/example-bootstrap.js b/example-bootstrap.js index 50b20a1221..bb3724e552 100644 --- a/example-bootstrap.js +++ b/example-bootstrap.js @@ -15,6 +15,7 @@ var exampleReady = function() { scripts.forEach(function(src) { var script = document.createElement('script'); + script.async = true; script.onload = function() { if (++loaded == scripts.length) exampleReady(); }; diff --git a/playground/basic-example/main.js b/playground/basic-example/main.js index b53363d578..5883928a3f 100644 --- a/playground/basic-example/main.js +++ b/playground/basic-example/main.js @@ -1,8 +1,10 @@ import {bootstrap} from 'angular2/core'; import {Component, Template} from 'angular2/angular2'; -import {Aside, AsideParent} from 'ionic2/components'; +import {Aside, AsideParent} from 'ionic2/components/aside/aside'; -@Component({ selector: '[my-app]' }) +@Component({ + selector: '[my-app]' +}) @Template({ url: 'main.html', directives: [Aside, AsideParent] diff --git a/src/components.js b/src/components.js deleted file mode 100644 index 82972a4fda..0000000000 --- a/src/components.js +++ /dev/null @@ -1,7 +0,0 @@ -// export * from './components/app/app'; - -export * from './components/aside/aside'; -import './components/aside/behaviors/direction/direction'; - -// export * from './components/switch'; - diff --git a/src/components/aside/aside.js b/src/components/aside/aside.js index a8b072146d..a8f0720739 100644 --- a/src/components/aside/aside.js +++ b/src/components/aside/aside.js @@ -43,30 +43,28 @@ export class Aside { ) { this.domElement = element.domElement; - this._drag = {}; - this.domElement.addEventListener('transitionend', ev => { this.setChanging(false); }) - let gestureConstructor = { - left: LeftAsideSlideGesture, - top: TopAsideSlideGesture, - bottom: BottomAsideSlideGesture, - right: RightAsideSlideGesture - }; - - // TODO: remove this. setTimeout has to be done so the bindings can be applied setTimeout(() => { // asideConfig.invoke(this); + let GestureConstructor = { + left: LeftAsideSlideGesture, + top: TopAsideSlideGesture, + bottom: BottomAsideSlideGesture, + right: RightAsideSlideGesture + }[this.side]; this.domElement.classList.add(this.side); - this.gesture = new gestureConstructor[this.side](this, asideParent.domElement); + this.gesture = new GestureConstructor(this, asideParent.domElement); this.gesture.listen(); }); } setSliding(isSliding) { - this.domElement.classList[isSliding ? 'add' : 'remove']('sliding'); + if (isSliding !== this.isSliding) { + this.domElement.classList[isSliding ? 'add' : 'remove']('sliding'); + } } setChanging(isChanging) { if (isChanging !== this.isChanging) { diff --git a/src/components/aside/behaviors/direction/direction.js b/src/components/aside/behaviors/direction/direction.js deleted file mode 100644 index e9968d3545..0000000000 --- a/src/components/aside/behaviors/direction/direction.js +++ /dev/null @@ -1,120 +0,0 @@ -import {asideConfig} from '../../aside'; -import Hammer from 'hammer'; -import * as util from '../../../../util'; - -/* -asideConfig - .behavior(function() { - if (this.side !== 'bottom') return; - - this.gesture.options({ - direction: Hammer.DIRECTION_VERTICAL - }); - this.domElement.classList.add('bottom'); - util.extend(this.dragMethods, { - canStart: ev => { - return this.isOpen || ev.center.y > window.innerHeight - this.dragThreshold; - }, - getMenuStart: (drag, ev) => { - return this.isOpen ? -drag.height : 0; - }, - onDrag: (drag, ev) => { - drag.pos = util.clamp( - 0, -drag.menuStart + drag.pointerStart - ev.center.y, drag.height - ); - this.domElement.style.transform = 'translate3d(0,' + - (drag.height - drag.pos) + 'px,0)'; - }, - onEnd: (drag, ev) => { - this.setOpen(drag.pos > drag.height / 2); - this.domElement.style.transform = ''; - }, - getEventPos: ev => { - return ev.center.y; - } - }); - }) - .behavior(function() { - if (this.side !== 'left') return; - - - this.domElement.classList.add('left'); - this.gesture.options({ - direction: Hammer.DIRECTION_HORIZONTAL - }); - util.extend(this.dragMethods, { - canStart: (ev) => { - return this.isOpen || ev.center.x < this.dragThreshold; - }, - getMenuStart: (drag, ev) => { - return this.isOpen ? drag.width : 0; - }, - onDrag: (drag, ev) => { - drag.pos = util.clamp( - 0, drag.menuStart + ev.center.x - drag.pointerStart, drag.width - ); - this.domElement.style.transform = 'translate3d(' + (-drag.width + drag.pos) + 'px, 0, 0)'; - }, - onEnd: (drag, ev) => { - this.setOpen(drag.pos > drag.width / 2); - this.domElement.style.transform = ''; - } - }) - - }) - .behavior(function() { - if (this.side !== 'right') return; - - this.domElement.classList.add('right'); - this.gesture.options({ - direction: Hammer.DIRECTION_HORIZONTAL - }); - util.extend(this.dragMethods, { - canStart: ev => { - return this.isOpen || ev.center.x > window.innerWidth - this.dragThreshold; - }, - getMenuStart: (drag, ev) => { - return this.isOpen ? -drag.width : 0; - }, - onDrag: (drag, ev) => { - drag.pos = util.clamp( - 0, -drag.menuStart + drag.pointerStart - ev.center.x, drag.width - ); - this.domElement.style.transform = 'translate3d(' + - (drag.width - drag.pos) + 'px,0,0)'; - }, - onEnd: (drag, ev) => { - this.setOpen(drag.pos > drag.width / 2); - this.domElement.style.transform = ''; - } - }); - - }) - .behavior(function() { - if (this.side !== 'top') return; - - this.domElement.classList.add('top'); - util.extend(this.dragMethods, { - canStart: ev => { - return this.isOpen || ev.center.y < this.dragThreshold * 5; - }, - getMenuStart: (drag, ev) => { - return this.isOpen ? drag.height : 0; - }, - onDrag: (drag, ev) => { - drag.pos = util.clamp( - 0, drag.menuStart + ev.center.y - drag.pointerStart, drag.height - ); - this.domElement.style.transform = 'translate3d(0, ' + - (-drag.height + drag.pos) + 'px, 0)'; - }, - onEnd: (drag, ev) => { - this.setOpen(drag.pos > drag.height / 2); - this.domElement.style.transform = ''; - }, - getEventPos: (ev) => { - return ev.center.y; - } - }); - }); -*/ diff --git a/src/components/aside/behaviors/direction/directions.scss b/src/components/aside/behaviors/direction/directions.scss deleted file mode 100644 index e69de29bb2..0000000000