diff options
Diffstat (limited to 'qml')
| -rwxr-xr-x | qml/wifi-settings/wifi-settings-app.qml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/qml/wifi-settings/wifi-settings-app.qml b/qml/wifi-settings/wifi-settings-app.qml index c25934d..d2af106 100755 --- a/qml/wifi-settings/wifi-settings-app.qml +++ b/qml/wifi-settings/wifi-settings-app.qml @@ -89,7 +89,11 @@ ApplicationWindow { request(wifiAPIpath + 'deactivate', function (o) { // log the json response +<<<<<<< HEAD + //showRequestInfo(o.responseText) +======= showRequestInfo(o.responseText) +>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d console.log(o.responseText) }) } @@ -110,7 +114,11 @@ ApplicationWindow { request(wifiAPIpath + 'activate', function (o) { // log the json response +<<<<<<< HEAD + //showRequestInfo(o.responseText) +======= showRequestInfo(o.responseText) +>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d console.log(o.responseText) }) periodicRefresh.start() @@ -273,7 +281,11 @@ ApplicationWindow { request(wifiAPIpath + 'scan', function (o) { // log the json response +<<<<<<< HEAD + //showRequestInfo(o.responseText) +======= showRequestInfo(o.responseText) +>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d console.log(o.responseText) }) } @@ -450,7 +462,11 @@ ApplicationWindow { request(wifiAPIpath + 'disconnect?network=' + index, function (o) { +<<<<<<< HEAD + //showRequestInfo(o.responseText) +======= showRequestInfo(o.responseText) +>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d console.log(o.responseText) }) } else { @@ -461,7 +477,11 @@ ApplicationWindow { function (o) { // log the json response +<<<<<<< HEAD + //showRequestInfo(o.responseText) +======= showRequestInfo(o.responseText) +>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d console.log(o.responseText) }) } @@ -532,7 +552,11 @@ ApplicationWindow { request(wifiAPIpath + 'security?passkey=' + passkey, function (o) { +<<<<<<< HEAD + //showRequestInfo(o.responseText) +======= showRequestInfo(o.responseText) +>>>>>>> 18e149d5c2f7155ef2933fe4e3ac15837c99235d console.log(o.responseText) }) passwordValidateButton.visible = false |