Merge pull request #3683 from bryan-m-hughes/timob-10380-3_0_X

[TIMOB-10380] Added check to make sure there is an active window on update
tidev · Jan 10, 2013 · f6b34fc · f6b34fc
2 parents 8237bb6 + 5c7f542
commit f6b34fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/mobileweb/titanium/Ti/UI/MobileWeb/NavigationGroup.js b/mobileweb/titanium/Ti/UI/MobileWeb/NavigationGroup.js
@@ -68,7 +68,12 @@ define(['Ti/_/css', 'Ti/_/declare', 'Ti/UI/View', 'Ti/UI', 'Ti/_/lang'],
 				rightContainer = _self._rightContainer,
 				leftView,
 				centerView,
-				rightView = activeWin.rightNavButton;
+				rightView;
+
+			if (!activeWin) {
+				return;
+			}
+			rightView = activeWin.rightNavButton;
 
 			if (activeWin.leftNavButton) {
 				leftView = activeWin.leftNavButton;

diff --git a/mobileweb/titanium/dependencies.json b/mobileweb/titanium/dependencies.json
@@ -538,13 +538,12 @@
 		"Ti/UI"
 	],
 	"Ti/UI/ScrollableView": [
-		"Ti/_/browser",
 		"Ti/_/declare",
-		"Ti/_/UI/KineticScrollView",
-		"Ti/_/lang",
+		"Ti/UI/View",
 		"Ti/_/dom",
 		"Ti/_/style",
-		"Ti/UI"
+		"Ti/UI",
+		"Ti/_/browser"
 	],
 	"Ti/UI/ScrollView": [
 		"Ti/_/declare",