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

Merge remote-tracking branch 'origin/master' into WIP-api-demos

Browse Source
This commit is contained in:
Drew Rygh
2015-12-16 11:13:03 -06:00
parent adf62fdc41 364f9e12ae
commit 068f3ceb29
185 changed files with 2645 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/scroll/scroll.ts
View File

@@ -1,4 +1,4 @@
import {Component, ElementRef, onInit} from 'angular2/angular2';
import {Component, ElementRef, onInit} from 'angular2/core';
import {Ion} from '../ion';
import {Config} from '../../config/config';
@@ -6,7 +6,7 @@ import {Gesture} from '../../gestures/gesture';
import {CSS} from '../../util/dom';
import {Animation} from '../../animations/animation';
import * as util from 'ionic/util';
import * as util from '../../util';
/**
* @name Scroll