javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
hshristov
2015-10-15 09:29:39 +03:00
parent a3c70b5e28
commit 4a594ddb95
1 changed files with 71 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/tests/ui/scroll-view/scroll-view-tests.ts
View File

@ -25,10 +25,7 @@ import scrollViewModule = require("ui/scroll-view");
// </snippet>
var ASYNC = 0.3;
var tmp: buttonModule.Button;
var newPage: page.Page;
class ScrollLayoutTest extends testModule.UITest<scrollViewModule.ScrollView> {
public create(): scrollViewModule.ScrollView {
return new scrollViewModule.ScrollView();
}
@ -75,7 +72,7 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
let btn = new button.Button();
btn.text = "test";
btn.height = 100;
this.testView.content = btn;
@ -91,7 +88,7 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
let btn = new button.Button();
btn.text = "test";
btn.height = 500;
this.testView.content = btn;
@ -107,7 +104,7 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
let btn = new button.Button();
btn.text = "test";
btn.width = 100;
this.testView.content = btn;
@ -123,7 +120,7 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
let btn = new button.Button();
btn.text = "test";
btn.width = 500;
this.testView.content = btn;
@ -139,7 +136,7 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
let btn = new button.Button();
btn.text = "test";
btn.height = 500;
this.testView.content = btn;
@ -156,7 +153,7 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
let btn = new button.Button();
btn.text = "test";
btn.height = 500;
this.testView.content = btn;
@ -180,7 +177,7 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
let btn = new button.Button();
btn.text = "test";
btn.width = 500;
this.testView.content = btn;
@ -197,7 +194,7 @@ var scrollView = new scrollViewModule.ScrollView();
this.testView.width = 200;
this.testView.height = 300;
var btn = new button.Button();
let btn = new button.Button();
btn.text = "test";
btn.width = 500;
this.testView.content = btn;