javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 20:11:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Comment out TabView which does not compile

Browse Source
This commit is contained in:
Rossen Hristov
2016-12-20 14:23:37 +02:00
parent 2aebdd800c
commit 3cfab990c4
3 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app/package.json
View File

@ -1,4 +1,4 @@
{
"name": "tns-samples-apps",
"main": "cuteness.io/app.js"
"main": "ui-tests-app/app.js"
}

69
tns-core-modules/ui/tab-view/tab-view.android.ts
View File

@ -227,46 +227,47 @@ export class TabView extends TabViewBase {
}
public _onItemsPropertyChangedSetNativeValue() {
let oldItems = <TabViewItem[]>this.previousItems;
if (oldItems) {
oldItems.forEach((oldItem) => {
// _removeView is called within destroyItem method
oldItem._parent = null;
});
throw new Error("Compilation error: Can't find this.previousItems");
// let oldItems = <TabViewItem[]>this.previousItems;
// if (oldItems) {
// oldItems.forEach((oldItem) => {
// // _removeView is called within destroyItem method
// oldItem._parent = null;
// });
this._viewPager.setAdapter(null);
this._pagerAdapter = null;
this._tabLayout.setItems(null, null);
}
// this._viewPager.setAdapter(null);
// this._pagerAdapter = null;
// this._tabLayout.setItems(null, null);
// }
let items = <TabViewItem[]>this.items;
if (items) {
let tabItems = new Array<org.nativescript.widgets.TabItemSpec>();
items.forEach((item, idx, arr) => {
if (!item.view) {
throw new Error("View of TabViewItem at index " + idx + " is " + item.view);
}
// let items = <TabViewItem[]>this.items;
// if (items) {
// let tabItems = new Array<org.nativescript.widgets.TabItemSpec>();
// items.forEach((item, idx, arr) => {
// if (!item.view) {
// throw new Error("View of TabViewItem at index " + idx + " is " + item.view);
// }
item._parent = this;
if (item.view.parent !== this) {
this._addView(item.view, idx);
}
tabItems.push(this.createTabItem(item));
});
// item._parent = this;
// if (item.view.parent !== this) {
// this._addView(item.view, idx);
// }
// tabItems.push(this.createTabItem(item));
// });
ensurePagerAdapterClass();
// TODO: optimize by reusing the adapter and calling setAdapter(null) then the same adapter.
this._pagerAdapter = new PagerAdapterClass(this, items);
this._viewPager.setAdapter(this._pagerAdapter);
// ensurePagerAdapterClass();
// // TODO: optimize by reusing the adapter and calling setAdapter(null) then the same adapter.
// this._pagerAdapter = new PagerAdapterClass(this, items);
// this._viewPager.setAdapter(this._pagerAdapter);
this._tabLayout.setItems(tabItems, this._viewPager);
}
// this._tabLayout.setItems(tabItems, this._viewPager);
// }
let nativeSelectedIndex = this._viewPager.getCurrentItem();
let selectedIndex = this.selectedIndex;
if (selectedIndex < 0) {
this.selectedIndex = nativeSelectedIndex;
}
// let nativeSelectedIndex = this._viewPager.getCurrentItem();
// let selectedIndex = this.selectedIndex;
// if (selectedIndex < 0) {
// this.selectedIndex = nativeSelectedIndex;
// }
}
public _updateTabForItem(item: TabViewItem) {

17
tns-core-modules/ui/tab-view/tab-view.ios.ts
View File

@ -400,15 +400,16 @@ export class TabView extends TabViewBase {
}
private _onItemsPropertyChangedSetNativeValue() {
let oldValue = <TabViewItem[]>this.previousItems;
if (oldValue) {
this._removeTabs(oldValue);
}
throw new Error("Compilation error: Can't find this.previousItems");
// let oldValue = <TabViewItem[]>this.previousItems;
// if (oldValue) {
// this._removeTabs(oldValue);
// }
let newValue = <TabViewItem[]>this.items;
if (newValue) {
this._addTabs(newValue);
}
// let newValue = <TabViewItem[]>this.items;
// if (newValue) {
// this._addTabs(newValue);
// }
}
get [selectedIndexProperty.native](): number {