From 219bd190c050fd19d035e5850501e5d0a982eaf5 Mon Sep 17 00:00:00 2001 From: peteruithoven Date: Tue, 4 Feb 2014 14:18:50 +0100 Subject: [PATCH] Reenabled commented parts and small fixes --- js/settings/FormPanel.js | 18 ++----- js/settings/NetworkPanel.js | 90 ++++++++++++++++++----------------- js/settings/SettingsWindow.js | 14 ++---- 3 files changed, 57 insertions(+), 65 deletions(-) diff --git a/js/settings/FormPanel.js b/js/settings/FormPanel.js index 56ecb40..7c5376b 100644 --- a/js/settings/FormPanel.js +++ b/js/settings/FormPanel.js @@ -22,20 +22,13 @@ function FormPanel() { // needed to have the subclass instance access the same counter _self = this; _element = panelElement; - //_configAPI.init(wifiboxURL,wifiboxCGIBinURL); - - console.log(" calling _self.readForm from FormPanel:init"); - _self.readForm(); - //console.log(" calling this.readForm from FormPanel:init"); - //this.readForm(); - //console.log(" calling _self2.readForm from FormPanel:init"); - //_self2.readForm(); + _configAPI.init(wifiboxURL,wifiboxCGIBinURL); }; //this.readForm = function(form) { FormPanel.prototype.readForm = function(form) { console.log("FormPanel:readForm"); - /*if(!form) form = _element; // if no form specified, read whole panel form + if(!form) form = _element; // if no form specified, read whole panel form //console.log("FormPanel"); var settings = {}; // Read all selects @@ -70,10 +63,10 @@ function FormPanel() { settings[elem.attr('name')] = elem.val(); }); console.log(" settings: ",settings); - return settings;*/ + return settings; }; - /*this.fillForm = function(settings,form) { + this.fillForm = function(settings,form) { console.log("FormPanel:fillForm"); if(!form) form = _element; // if no form specified, fill whole panel form console.log(" settings: ",settings); @@ -109,7 +102,6 @@ function FormPanel() { this.saveSettings = function(newSettings,complete) { console.log("FormPanel:saveSettings"); console.log(" newSettings: ",newSettings); - console.log(" form: ",form); _configAPI.save(newSettings,function(data) { var validation = data.validation; console.log(" validation: ",validation); @@ -139,5 +131,5 @@ function FormPanel() { function clearValidationErrors() { _element.find(".errorMsg").remove(); _element.find(".error").removeClass("error"); - };*/ + }; } diff --git a/js/settings/NetworkPanel.js b/js/settings/NetworkPanel.js index ced4599..46ff183 100644 --- a/js/settings/NetworkPanel.js +++ b/js/settings/NetworkPanel.js @@ -12,7 +12,7 @@ NetworkPanel.prototype = new FormPanel(); function NetworkPanel() { // network client mode states - /*var CLIENT_MODE_STATE = { + var CLIENT_MODE_STATE = { NOT_CONNECTED: "not connected", // also used as first item in networks list CONNECTED: "connected", CONNECTING: "connecting", @@ -63,7 +63,7 @@ function NetworkPanel() { var _passwordField; var _passwordLabel; var _clientStateDisplay; - var _apModeStateDisplay;*/ + var _apModeStateDisplay; var _self = this; @@ -72,10 +72,7 @@ function NetworkPanel() { // super call: _self.constructor.prototype.init.call(_self,wifiboxURL,wifiboxCGIBinURL,panelElement); - console.log(" calling readForm from NetworkPanel:init"); - _self.readForm(); - - /*_api.init(wifiboxURL,wifiboxCGIBinURL); + _api.init(wifiboxURL,wifiboxCGIBinURL); _element = panelElement; _apRadioButton = _element.find("#ap"); @@ -96,12 +93,12 @@ function NetworkPanel() { _btnRefresh.on('touchstart mousedown',onRefreshClick); _btnConnect.on('touchstart mousedown',_self.connectToNetwork); _btnCreate.on('touchstart mousedown',_self.createAP); - _networkSelector.change(networkSelectorChanged);*/ + _networkSelector.change(networkSelectorChanged); } /* * Handlers */ - /* + function showAPSettings() { _apFieldSet.show(); _clientFieldSet.hide(); @@ -124,7 +121,7 @@ function NetworkPanel() { this.update = function() { console.log("NetworkPanel:update"); _self.refreshNetworks(); - _self.retrieveStatus(false); + _self.retrieveNetworkStatus(false); } this.refreshNetworks = function(completeHandler) { console.log("NetworkPanel:refreshNetworks"); @@ -154,8 +151,8 @@ function NetworkPanel() { }); }; - this.retrieveStatus = function(connecting) { - //console.log("NetworkPanel:retrieveStatus"); + this.retrieveNetworkStatus = function(connecting) { + //console.log("NetworkPanel:retrieveNetworkStatus"); _api.status(function(data) { if(typeof data.status === 'string') { data.status = parseInt(data.status); @@ -172,7 +169,7 @@ function NetworkPanel() { case NetworkAPI.STATUS.CONNECTED: setNetworkMode(NETWORK_MODE.CLIENT); - if(data.status == SettingsWindow.API_CONNECTED) { + if(data.status == NetworkAPI.STATUS.CONNECTED) { _networkSelector.val(data.ssid); _currentNetwork = data.ssid; @@ -190,7 +187,7 @@ function NetworkPanel() { _self.selectNetwork(CLIENT_MODE_STATE.NOT_CONNECTED); _networkSelector.val(CLIENT_MODE_STATE.NOT_CONNECTED); - if(data.ssid && data.status == SettingsWindow.API_CREATED) { + if(data.ssid && data.status == NetworkAPI.STATUS.CREATED) { _currentAP = data.ssid; } break; @@ -230,18 +227,18 @@ function NetworkPanel() { case NetworkAPI.STATUS.CONNECTING: case NetworkAPI.STATUS.CREATING: clearTimeout(_retryRetrieveStatusDelay); - _retryRetrieveStatusDelay = setTimeout(function() { _self.retrieveStatus(connecting); },_retryRetrieveStatusDelayTime); // retry after delay + _retryRetrieveStatusDelay = setTimeout(function() { _self.retrieveNetworkStatus(connecting); },_retryRetrieveStatusDelayTime); // retry after delay break; } } }, function() { console.log("NetworkPanel:retrieveStatus failed"); clearTimeout(_retryRetrieveStatusDelay); - _retryRetrieveStatusDelay = setTimeout(function() { _self.retrieveStatus(connecting); }, _retryRetrieveStatusDelayTime); // retry after delay + _retryRetrieveStatusDelay = setTimeout(function() { _self.retrieveNetworkStatus(connecting); }, _retryRetrieveStatusDelayTime); // retry after delay }); }; function setNetworkMode(mode) { - //console.log("NetworkPanel:setNetworkMode: ",mode); + console.log("NetworkPanel:setNetworkMode: ",_networkMode,">",mode); if(mode == _networkMode) return; switch(mode) { case NETWORK_MODE.NEITHER: @@ -265,9 +262,8 @@ function NetworkPanel() { } this.selectNetwork = function(ssid) { - console.log("select network: ",ssid); + console.log("NetworkPanel:selectNetwork: ",ssid); if(ssid == "") return; - //console.log(" checked"); _selectedNetwork = ssid; if(_networks == undefined || ssid == CLIENT_MODE_STATE.NOT_CONNECTED) { hideWiFiPassword(); @@ -291,49 +287,58 @@ function NetworkPanel() { }; function setClientModeState(state,statusMessage) { + console.log("NetworkPanel:setClientModeState ",state,statusMessage); + //console.log(" CLIENT_MODE_STATE.CONNECTING: ",CLIENT_MODE_STATE.CONNECTING); var msg = ""; switch(state) { - case SettingsWindow.NOT_CONNECTED: - _btnConnect.removeAttr("disabled"); - msg = "Not connected"; - break; - case SettingsWindow.CONNECTED: - _btnConnect.removeAttr("disabled"); - - msg = "Connected to: "+_currentNetwork+"."; - if(_currentLocalIP != undefined && _currentLocalIP != "") { - var a = ""+_currentLocalIP+""; - msg += " (IP: "+a+")"; - } - break; - case SettingsWindow.CONNECTING: - _btnConnect.attr("disabled", true); - msg = "Connecting... Reconnect by connecting your device to "+_selectedNetwork+" and going to connect.doodle3d.com"; - break; - case SettingsWindow.CONNECTING_FAILED: - _btnConnect.removeAttr("disabled"); - msg = statusMessage; - break; + case CLIENT_MODE_STATE.NOT_CONNECTED: + //console.log("CLIENT_MODE_STATE.NOT_CONNECTED"); + _btnConnect.removeAttr("disabled"); + msg = "Not connected"; + break; + case CLIENT_MODE_STATE.CONNECTED: + //console.log("CLIENT_MODE_STATE.CONNECTED"); + _btnConnect.removeAttr("disabled"); + + msg = "Connected to: "+_currentNetwork+"."; + if(_currentLocalIP != undefined && _currentLocalIP != "") { + var a = ""+_currentLocalIP+""; + msg += " (IP: "+a+")"; + } + break; + case CLIENT_MODE_STATE.CONNECTING: + //console.log("CLIENT_MODE_STATE.CONNECTING"); + _btnConnect.attr("disabled", true); + msg = "Connecting... Reconnect by connecting your device to "+_selectedNetwork+" and going to connect.doodle3d.com"; + break; + case CLIENT_MODE_STATE.CONNECTING_FAILED: + //console.log("CLIENT_MODE_STATE.CONNECTING_FAILED"); + _btnConnect.removeAttr("disabled"); + msg = statusMessage; + break; } + console.log(" msg: ",msg); _clientStateDisplay.html(msg); _clientModeState = state; }; function setAPModeState(state,statusMessage) { + //console.log("NetworkPanel:setAPModeState ",state,statusMessage); var msg = ""; switch(state) { - case SettingsWindow.NO_AP: + case AP_MODE_STATE.NO_AP: _btnCreate.removeAttr("disabled"); msg = "Not currently a access point"; break; - case SettingsWindow.AP: + case AP_MODE_STATE.AP: _btnCreate.removeAttr("disabled"); msg = "Is access point: "+_currentAP+""; break; - case SettingsWindow.CREATING_AP: + case AP_MODE_STATE.CREATING_AP: _btnCreate.attr("disabled", true); msg = "Creating access point... Reconnect by connecting your device to "+settings.substituted_ssid+" and going to draw.doodle3d.com"; break; } + //console.log(" msg: ",msg); _apModeStateDisplay.html(msg); _apModeState = state; }; @@ -341,7 +346,6 @@ function NetworkPanel() { this.connectToNetwork = function() { console.log("NetworkPanel:connectToNetwork"); if(_selectedNetwork == undefined) return; - // save network related settings and on complete, connect to network _self.saveSettings(_self.readForm(),function(validated) { if(!validated) return; diff --git a/js/settings/SettingsWindow.js b/js/settings/SettingsWindow.js index ecb562f..622d245 100644 --- a/js/settings/SettingsWindow.js +++ b/js/settings/SettingsWindow.js @@ -45,11 +45,6 @@ function SettingsWindow() { this.init = function(wifiboxURL,wifiboxCGIBinURL) { - console.log("EARLY initialize network panel"); - //var _networkPanel = new NetworkPanel(); - _networkPanel.init(wifiboxURL,wifiboxCGIBinURL); - - this.wifiboxURL = wifiboxURL; this.wifiboxCGIBinURL = wifiboxCGIBinURL; @@ -63,7 +58,7 @@ function SettingsWindow() { $("#popupSettings").bind("onPopupCancel", function() { settingsPopup.close(); } ); $("#popupSettings").bind("onPopupCommit", self.submitwindow); - //this.window.find("#settingsContainer").load("settings.html", function() { + this.window.find("#settingsContainer").load("settings.html", function() { console.log("Settings:finished loading settings.html, now loading settings..."); self.form = self.window.find("form"); @@ -75,7 +70,7 @@ function SettingsWindow() { timeout: self.timeoutTime, success: function(response) { console.log("Settings:printer/listall response: ",response.data.printers); - console.log(" this: ",this); + //console.log(" this: ",this); // network panel console.log("initialize network panel"); var $networkPanelElement = self.form.find("#networkPanel"); @@ -106,7 +101,7 @@ function SettingsWindow() { }).fail(function() { console.log("FATAL ERROR: Settings:printer/listall failed"); }); - //}); //this.window.find + }); //this.window.find }; //this.init @@ -360,6 +355,7 @@ function SettingsWindow() { * FROM DOODLE3D.INI * */ + //TODO: find all references to these variables, replace them and finally remove these. var objectHeight = 20; var layerHeight = .2; @@ -406,4 +402,4 @@ var windowcenter = true; var windowfullscreen = false; var autoWarmUpCommand = "M104 S230"; //var checkTemperatureInterval = 3; -var autoWarmUpDelay = 3; +var autoWarmUpDelay = 3; \ No newline at end of file