Merge pull request NativeScript#1380 from NativeScript/nnikolov/TabViewAdditionalFixes

Nedyalko Nikolov · Nedyalko Nikolov · commit 6f66ca7f974c · 2016-01-15T14:08:40.000+02:00
Added _removeTabs implementation in common.
diff --git a/ui/tab-view/tab-view-common.ts b/ui/tab-view/tab-view-common.ts
@@ -150,7 +150,21 @@ export class TabView extends view.View implements definition.TabView, view.AddAr
     }
 
     public _removeTabs(oldItems: Array<definition.TabViewItem>) {
-        //
+        var i: number;
+        var length = oldItems.length;
+        var oldItem: definition.TabViewItem;
+        for (i = 0; i < length; i++) {
+            oldItem = oldItems[i];
+
+            if (!oldItem) {
+                throw new Error("TabViewItem at index " + i + " is undefined.");
+            }
+
+            if (!oldItem.view) {
+                throw new Error("TabViewItem at index " + i + " does not have a view.");
+            }
+            this._removeView(oldItem.view);
+        }        
     }
 
     public _addTabs(newItems: Array<definition.TabViewItem>) {
diff --git a/ui/tab-view/tab-view.android.ts b/ui/tab-view/tab-view.android.ts
@@ -225,8 +225,11 @@ export class TabView extends common.TabView {
 
         if (data.oldValue) {
             var oldItems: Array<TabViewItem> = data.oldValue;
-            oldItems.forEach((oldItem) => { oldItem._parent = null; });
-
+            oldItems.forEach((oldItem) => {
+                // _removeView is called within destroyItem method 
+                oldItem._parent = null; 
+            });
+            
             this._viewPager.setAdapter(null);
             this._pagerAdapter = null;
             this._tabLayout.setItems(null, null);
diff --git a/ui/tab-view/tab-view.ios.ts b/ui/tab-view/tab-view.ios.ts
@@ -173,7 +173,6 @@ export class TabView extends common.TabView {
             oldItem = <TabViewItem>oldItems[i];
             oldItem._parent = null;
             oldItem._controller = null;
-            this._removeView(oldItem.view);
         }
 
         this._ios.viewControllers = null;

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,6 @@ export class TabView extends common.TabView {`
`173`	`173`	`oldItem = <TabViewItem>oldItems[i];`
`174`	`174`	`oldItem._parent = null;`
`175`	`175`	`oldItem._controller = null;`
`176`		`- this._removeView(oldItem.view);`
`177`	`176`	`}`
`178`	`177`
`179`	`178`	`this._ios.viewControllers = null;`