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

Merge pull request #258 from NativeScript/feature/no-tab-content-bug

Browse Source 
TabView - content disapears after minimize
This commit is contained in:
Alexander Vakrilov
2015-06-02 17:30:12 +03:00
parent 9e2ee94303 b23f7333d6
commit 9321f275a1
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ui/tab-view/tab-view.android.ts
View File

@ -233,6 +233,7 @@ export class TabView extends common.TabView {
trace.write("TabView._onVisibilityChanged:" + this.android + " isShown():" + this.android.isShown(), common.traceCategory); trace.write("TabView._onVisibilityChanged:" + this.android + " isShown():" + this.android.isShown(), common.traceCategory);
if (this.isLoaded && this.android && this.android.isShown()) { if (this.isLoaded && this.android && this.android.isShown()) {
this._setAdapterIfNeeded();
this._addTabsIfNeeded(); this._addTabsIfNeeded();
this._setNativeSelectedIndex(this.selectedIndex); this._setNativeSelectedIndex(this.selectedIndex);
} }
@ -275,9 +276,8 @@ export class TabView extends common.TabView {
if (this.android && this.android.isShown()) { if (this.android && this.android.isShown()) {
// Cover the case when pageCacheOnNavigate is enabled - set adapter in loaded as the TabView is already // Cover the case when pageCacheOnNavigate is enabled - set adapter in loaded as the TabView is already
// attached and _onItemsPropertyChangedSetNativeValue will not be called // attached and _onItemsPropertyChangedSetNativeValue will not be called
if (!this._pagerAdapter && this.items) { this._setAdapterIfNeeded();
this._setAdapter(this.items);
}
this._addTabsIfNeeded(); this._addTabsIfNeeded();
this._setNativeSelectedIndex(this.selectedIndex); this._setNativeSelectedIndex(this.selectedIndex);
} }
@ -326,6 +326,12 @@ export class TabView extends common.TabView {
this._listenersSuspended = false; this._listenersSuspended = false;
} }
private _setAdapterIfNeeded() {
if (!this._pagerAdapter && this.items && this.items.length > 0) {
this._setAdapter(this.items);
}
}
private _setAdapter(items) { private _setAdapter(items) {
this._pagerAdapter = new PagerAdapterClass(this, items); this._pagerAdapter = new PagerAdapterClass(this, items);
this._android.setAdapter(this._pagerAdapter); this._android.setAdapter(this._pagerAdapter);