Merge branch 'develop'

js/BoxPage.js

@@ -53,14 +53,15 @@
 		//console.log("  _boxData: ",_boxData);
 		
 		_title.text(_boxData.wifiboxid);
-		setNetworkStatus(NetworkAPI.STATUS.CONNECTED);
 		
 		var drawLink = (_boxData.link)? _boxData.link : boxURL;
 		_page.find("#drawItem a").attr("href",drawLink);
 		
 		_networkAPI.init(boxURL);
-		retrieveNetworkStatus();
 		_updateAPI.init(boxURL);
+		
+		setNetworkStatus(NetworkAPI.STATUS.CONNECTED);
+		retrieveNetworkStatus();
   });
 	$.mobile.document.on( "pagebeforehide", PAGE_ID, function( event, data ) {
 		clearTimeout(_retryRetrieveStatusDelay);

js/UpdatingPage.js

@@ -87,6 +87,7 @@
 				}
 				break;
 			case UpdateAPI.STATUS.INSTALLED: 
+				_installing = false;
 				_updateAPI.stopAutoRefresh();
 				clearTimeout(_updatedRedirectDelay);
 				_updatedRedirectDelay = setTimeout(function () {
@@ -102,6 +103,9 @@
 					}
 				},UPDATED_REDIRECT_DELAY);
 				break;
+			case UpdateAPI.STATUS.INSTALL_FAILED:
+				_installing = false;
+				break;
 		}
 	}
 	function updatePage(data) {