vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-22 09:17:56 +01:00
Code Issues Releases Wiki Activity

Open Settings window after settings are loaded

Browse Source
This commit is contained in:
peteruithoven 2013-10-28 11:16:00 +01:00
parent f783726c47
commit cfff8b498f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js_src/SettingsWindow.js
View File

@ -151,13 +151,11 @@ function SettingsWindow() {
} }
this.showSettings = function() { this.showSettings = function() {
console.log("f:showSettings()"); this.loadSettings(function() { // reload settings
this.loadSettings(); // reload settings
// this.window.css("display","table");
$("#contentOverlay").fadeIn(375, function() { $("#contentOverlay").fadeIn(375, function() {
document.body.removeEventListener('touchmove',prevent,false); document.body.removeEventListener('touchmove',prevent,false);
}); });
});
} }
this.hideSettings = function(complete) { this.hideSettings = function(complete) {
$("#contentOverlay").fadeOut(375, function() { $("#contentOverlay").fadeOut(375, function() {
@ -167,7 +165,7 @@ function SettingsWindow() {
}); });
} }
this.loadSettings = function() { this.loadSettings = function(complete) {
if (!communicateWithWifibox) { if (!communicateWithWifibox) {
console.log(" communicateWithWifibox is false: settings aren't being loaded from wifibox...") console.log(" communicateWithWifibox is false: settings aren't being loaded from wifibox...")
return; return;
@ -184,6 +182,7 @@ function SettingsWindow() {
console.log(" settings: ",settings); console.log(" settings: ",settings);
self.fillForm(); self.fillForm();
$(document).trigger(SettingsWindow.SETTINGS_LOADED); $(document).trigger(SettingsWindow.SETTINGS_LOADED);
if(complete) complete();
} }
}).fail(function() { }).fail(function() {
console.log("Settings:loadSettings: failed"); console.log("Settings:loadSettings: failed");