vmario/doodle3d-connect
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-connect.git synced 2024-12-25 18:13:48 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
peteruithoven 2015-06-17 14:48:13 +02:00
commit 67feeb0dd5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/BoxPage.js
View File

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

4
js/UpdatingPage.js
View File

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