javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-24 23:01:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into searchbar-fix

Browse Source 
# Conflicts:
#	ionic/components/searchbar/searchbar.ts
This commit is contained in:
Brandy Carney
2015-12-10 17:55:44 -05:00
parent ab4ad905a8
commit ff8169cb0a
84 changed files with 634 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ionic/components/slides/slides.ts
View File

@ -1,13 +1,14 @@
import {Directive, Component, ElementRef, Host, NgClass, EventEmitter} from 'angular2/angular2';
import {Directive, Component, ElementRef, Host, EventEmitter} from 'angular2/core';
import {NgClass} from 'angular2/common';
import {Ion} from '../ion';
import {Animation} from 'ionic/animations/animation';
import {Gesture} from 'ionic/gestures/gesture';
import {DragGesture} from 'ionic/gestures/drag-gesture';
import {Animation} from '../../animations/animation';
import {Gesture} from '../../gestures/gesture';
import {DragGesture} from '../../gestures/drag-gesture';
import {Config} from '../../config/config';
import {dom} from 'ionic/util';
import {dom} from '../../util';
import {CSS} from '../../util/dom';
import * as util from 'ionic/util';
import * as util from '../../util';
import {Swiper} from './swiper-widget';
import {Scroll} from '../scroll/scroll';

1
ionic/components/slides/test/scroll/index.ts
View File

@ -1,5 +1,4 @@
import {App} from 'ionic/ionic';
import {NgIf} from 'angular/angular';
@App({
templateUrl: 'main.html',