javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(text-input): fixed typo

Browse Source
This commit is contained in:
Brandy Carney
2015-11-24 16:36:07 -05:00
parent 656b135d98
commit 0ce39ce217
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ionic/components/text-input/test/text-input.spec.ts
View File

@ -14,7 +14,7 @@ export function run() {
let keyboardHeight = 400; let keyboardHeight = 400;
let platformHeight = 800; let platformHeight = 800;
let scrollData = TextInput.getScollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight); let scrollData = TextInput.getScrollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight);
expect(scrollData.scrollAmount).toBe(-205); expect(scrollData.scrollAmount).toBe(-205);
expect(scrollData.scrollTo).toBe(235); expect(scrollData.scrollTo).toBe(235);
@ -33,7 +33,7 @@ export function run() {
let keyboardHeight = 400; let keyboardHeight = 400;
let platformHeight = 800; let platformHeight = 800;
let scrollData = TextInput.getScollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight); let scrollData = TextInput.getScrollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight);
expect(scrollData.scrollAmount).toBe(-205); expect(scrollData.scrollAmount).toBe(-205);
expect(scrollData.scrollTo).toBe(235); expect(scrollData.scrollTo).toBe(235);
@ -53,7 +53,7 @@ export function run() {
let keyboardHeight = 400; let keyboardHeight = 400;
let platformHeight = 800; let platformHeight = 800;
let scrollData = TextInput.getScollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight); let scrollData = TextInput.getScrollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight);
expect(scrollData.scrollAmount).toBe(150); expect(scrollData.scrollAmount).toBe(150);
expect(scrollData.scrollTo).toBe(100); expect(scrollData.scrollTo).toBe(100);
@ -73,7 +73,7 @@ export function run() {
let keyboardHeight = 400; let keyboardHeight = 400;
let platformHeight = 800; let platformHeight = 800;
let scrollData = TextInput.getScollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight); let scrollData = TextInput.getScrollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight);
expect(scrollData.scrollAmount).toBe(-80); expect(scrollData.scrollAmount).toBe(-80);
expect(scrollData.scrollTo).toBe(100); expect(scrollData.scrollTo).toBe(100);
@ -91,7 +91,7 @@ export function run() {
let keyboardHeight = 400; let keyboardHeight = 400;
let platformHeight = 800; let platformHeight = 800;
let scrollData = TextInput.getScollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight); let scrollData = TextInput.getScrollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight);
expect(scrollData.scrollAmount).toBe(-20); expect(scrollData.scrollAmount).toBe(-20);
expect(scrollData.scrollTo).toBe(20); expect(scrollData.scrollTo).toBe(20);
@ -109,7 +109,7 @@ export function run() {
let keyboardHeight = 400; let keyboardHeight = 400;
let platformHeight = 800; let platformHeight = 800;
let scrollData = TextInput.getScollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight); let scrollData = TextInput.getScrollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight);
expect(scrollData.scrollAmount).toBe(-180); expect(scrollData.scrollAmount).toBe(-180);
expect(scrollData.scrollTo).toBe(180); expect(scrollData.scrollTo).toBe(180);
@ -128,7 +128,7 @@ export function run() {
let keyboardHeight = 400; let keyboardHeight = 400;
let platformHeight = 800; let platformHeight = 800;
let scrollData = TextInput.getScollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight); let scrollData = TextInput.getScrollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, platformHeight);
expect(scrollData.scrollAmount).toBe(0); expect(scrollData.scrollAmount).toBe(0);
}); });

4
ionic/components/text-input/text-input.ts
View File

@ -160,7 +160,7 @@ export class TextInput {
// find out if text input should be manually scrolled into view // find out if text input should be manually scrolled into view
let ele = this.elementRef.nativeElement; let ele = this.elementRef.nativeElement;
let scrollData = TextInput.getScollData(ele.offsetTop, ele.offsetHeight, scrollView.getDimensions(), this.keyboardHeight, this.platform.height()); let scrollData = TextInput.getScrollData(ele.offsetTop, ele.offsetHeight, scrollView.getDimensions(), this.keyboardHeight, this.platform.height());
if (scrollData.scrollAmount > -3 && scrollData.scrollAmount < 3) { if (scrollData.scrollAmount > -3 && scrollData.scrollAmount < 3) {
// the text input is in a safe position that doesn't require // the text input is in a safe position that doesn't require
// it to be scrolled into view, just set focus now // it to be scrolled into view, just set focus now
@ -211,7 +211,7 @@ export class TextInput {
* @param {TODO} keyboardHeight TODO * @param {TODO} keyboardHeight TODO
* @returns {TODO} TODO * @returns {TODO} TODO
*/ */
static getScollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, plaformHeight) { static getScrollData(inputOffsetTop, inputOffsetHeight, scrollViewDimensions, keyboardHeight, plaformHeight) {
// compute input's Y values relative to the body // compute input's Y values relative to the body
let inputTop = (inputOffsetTop + scrollViewDimensions.contentTop - scrollViewDimensions.scrollTop); let inputTop = (inputOffsetTop + scrollViewDimensions.contentTop - scrollViewDimensions.scrollTop);
let inputBottom = (inputTop + inputOffsetHeight); let inputBottom = (inputTop + inputOffsetHeight);