Changes in Network view

src/pineapple/modules/Networking/js/module.js

@@ -116,6 +116,8 @@ registerController('NetworkingModeController', ['$api', '$scope', '$timeout', fu
     $scope.connecting = false;
     $scope.noNetworkFound = false;
     $scope.loading = false;
+    $scope.info = '';
+    $scope.actions = '';
 
     $scope.getInterfaces = (function() {
         $scope.interfaces = [];
@@ -167,8 +169,7 @@ registerController('NetworkingModeController', ['$api', '$scope', '$timeout', fu
         });
     });
 
-    $scope.reloadData = (function() {
-        $scope.loading = true;
+    $scope.checkConnection = (function() {
         $api.request({
             module: 'Networking',
             action: 'checkConnection'
@@ -181,7 +182,6 @@ registerController('NetworkingModeController', ['$api', '$scope', '$timeout', fu
                     $scope.connectedSSID = response.ssid;
                     $scope.connectedIP = response.ip;
                 } else {
-                    $scope.connected = false;
                     $scope.getInterfaces();
                 }
             }
@@ -206,10 +206,6 @@ registerController('NetworkingModeController', ['$api', '$scope', '$timeout', fu
         });
     });
 
-    // from NetworkingInfoController
-    $scope.info = '';
-    $scope.actions = '';
-
     $scope.interfaceActions = (function(type, wlan) {
         $scope.actions = 'loading';
         $api.request({
@@ -242,6 +238,14 @@ registerController('NetworkingModeController', ['$api', '$scope', '$timeout', fu
         });
     });
 
+    $scope.reloadData = (function() {
+        $scope.loading = true;
+        $scope.checkConnection();
+        if ($scope.connected) {
+            $scope.getInterfaces();
+        }
+    });
+
     $scope.reloadData();
 }]);
 

src/pineapple/modules/Networking/module.html

@@ -20,7 +20,7 @@
                         <h3 class="panel-title">
                             WiFi Client Mode
                             <span class="pull-right">
-                                <button class="btn btn-default btn-xs btn-fixed-length" ng-disabled="loading" ng-click="reloadData();">
+                                <button class="btn btn-default btn-xs btn-fixed-length" ng-disabled="loading" ng-click="checkConnection();">
                                     Refresh
                                 </button>
                             </span>
@@ -128,6 +128,11 @@
                     <div class="panel-heading">
                         <h3 class="panel-title">
                             Interface actions
+                            <span class="pull-right">
+                                <button class="btn btn-default btn-xs btn-fixed-length" ng-disabled="loading" ng-click="getInterfaces();">
+                                    Refresh
+                                </button>
+                            </span>
                         </h3>
                     </div>
                     <div class="panel-body">