From 43f5b092fdd4b4e9a37c81c63145dd5075ae42e0 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 18 Oct 2015 22:38:12 +0100
Subject: [PATCH] fix(tabs): prevent flicker when loading tab

---
 ionic/components/tabs/tabs.ts | 20 ++++++++++----------
 scripts/build/config.js       |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts
index 93e9313181..2cdeaeae13 100644
--- a/ionic/components/tabs/tabs.ts
+++ b/ionic/components/tabs/tabs.ts
@@ -166,20 +166,20 @@ export class Tabs extends Ion {
 
     selectedTab.load(() => {
       this._isReady && this._isReady();
-    });
 
-    this._tabs.forEach(tab => {
-      tab.isSelected = (tab === selectedTab);
+      this._tabs.forEach(tab => {
+        tab.isSelected = (tab === selectedTab);
 
-      tab._views.forEach(viewCtrl => {
-        let navbarRef = viewCtrl.navbarRef();
-        if (navbarRef) {
-          navbarRef.nativeElement.classList[tab.isSelected ? 'remove': 'add']('deselected-tab');
-        }
+        tab._views.forEach(viewCtrl => {
+          let navbarRef = viewCtrl.navbarRef();
+          if (navbarRef) {
+            navbarRef.nativeElement.classList[tab.isSelected ? 'remove': 'add']('deselected-tab');
+          }
+        });
       });
-    });
 
-    this.highlight && this.highlight.select(selectedTab);
+      this.highlight && this.highlight.select(selectedTab);
+    });
   }
 
   /**
diff --git a/scripts/build/config.js b/scripts/build/config.js
index 2835263a0b..77a8847b00 100644
--- a/scripts/build/config.js
+++ b/scripts/build/config.js
@@ -16,6 +16,7 @@ module.exports = {
     'node_modules/systemjs/dist/system.js',
     'node_modules/angular2/bundles/angular2.dev.js',
     'node_modules/angular2/bundles/router.dev.js',
+    'node_modules/angular2/bundles/http.dev.js',
     'dist/js/ionic.js',
     'scripts/resources/web-animations-js/web-animations.min.js'
   ],