Added delete and hard delete functionality, fixed resize items change…

… fullscreen to maximize, added f12 to devtools
nachos · Mar 11, 2015 · 9920ff7 · 9920ff7
1 parent 54bea7d
commit 9920ff7
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 20 deletions.
diff --git a/client/app/main/side-nav/side-nav.html b/client/app/main/side-nav/side-nav.html
@@ -9,8 +9,8 @@
     </md-toolbar>
     <div layout="column">
       <md-subheader>Drives</md-subheader>
-      <md-button aria-label="drive" ng-click="goToDir('E:')">E:</md-button>
-      <md-button aria-label="drive" ng-click="goToDir('C:')">C:</md-button>
+      <md-button aria-label="drive" ng-click="goToDir('E:\\')">E:</md-button>
+      <md-button aria-label="drive" ng-click="goToDir('C:\\')">C:</md-button>
     </div>
   </md-sidenav>
 </div>
diff --git a/client/app/main/view/view.controller.js b/client/app/main/view/view.controller.js
@@ -6,7 +6,8 @@ angular.module('fileExplorerApp')
     var async = require('async');
     var path = require('path');
     var _ = require('lodash');
-    var shell = require('nw.gui').Shell;
+    var gui = require('nw.gui');
+    var shell = gui.Shell;
     var nativeApi = require('native-api');
     var nativeFile = nativeApi.file;
     var directory = $stateParams.path;
@@ -80,7 +81,8 @@ angular.module('fileExplorerApp')
       }
     };
 
-    hotkeys.add({
+    hotkeys.bindTo($scope)
+      .add({
       combo: 'right',
       description: 'Select the item on the right of the selected item',
       callback: function () {
@@ -95,7 +97,8 @@ angular.module('fileExplorerApp')
       }
     });
 
-    hotkeys.add({
+    hotkeys.bindTo($scope)
+      .add({
       combo: 'left',
       description: 'Select the item on the left of the selected item',
       callback: function () {
@@ -110,7 +113,8 @@ angular.module('fileExplorerApp')
       }
     });
 
-    hotkeys.add({
+    hotkeys.bindTo($scope)
+      .add({
       combo: 'down',
       description: 'Select the item below the selected item',
       callback: function () {
@@ -125,7 +129,8 @@ angular.module('fileExplorerApp')
       }
     });
 
-    hotkeys.add({
+    hotkeys.bindTo($scope)
+      .add({
       combo: 'up',
       description: 'Select the item on top of the selected item',
       callback: function () {
@@ -139,15 +144,17 @@ angular.module('fileExplorerApp')
       }
     });
 
-    hotkeys.add({
+    hotkeys.bindTo($scope)
+      .add({
       combo: 'enter',
       description: 'Open selected item',
       callback: function () {
         $scope.openItem($scope.items[$scope.selectedItemIndex]);
       }
     });
 
-    hotkeys.add({
+    hotkeys.bindTo($scope)
+      .add({
       combo: '+',
       description: 'Increase number of items per row (should be ctrl++ not working for now)',
       callback: function () {
@@ -157,7 +164,8 @@ angular.module('fileExplorerApp')
       }
     });
 
-    hotkeys.add({
+    hotkeys.bindTo($scope)
+      .add({
       combo: 'ctrl+-',
       description: 'Decrease number of items per row',
       callback: function () {
@@ -166,4 +174,13 @@ angular.module('fileExplorerApp')
         }
       }
     });
+
+    hotkeys.bindTo($scope)
+      .add({
+      combo: 'f12',
+      callback: function () {
+        gui.Window.get().showDevTools();
+      }
+    });
+
   });
diff --git a/client/app/main/view/view.html b/client/app/main/view/view.html
@@ -1,4 +1,4 @@
-<div layout="row" layout-wrap layout-padding>
+<div layout="row" layout-wrap layout-padding layout-align="space-between">
   <div flex="{{ 5 * Math.floor(100 / itemsPerRow / 5) }}" ng-repeat="item in items track by item.path" class="file"
        ng-click="selectItem($index)" ng-dblclick="openItem(item)"
        ng-class="{ selected: selectedItemIndex == $index }">
@@ -11,4 +11,5 @@
       <span>{{ item.name }}</span>
     </div>
   </div>
+  <div flex ng-hide="items.length % itemsPerRow == 0"></div>
 </div>
diff --git a/client/app/shell/shell.controller.js b/client/app/shell/shell.controller.js
@@ -11,8 +11,13 @@ angular.module('fileExplorerApp')
   };
 
   $scope.toggleFullscreen = function (){
+    if(!$scope.isFullScreen){
+      nwin.maximize();
+    }
+    else{
+      nwin.unmaximize();
+    }
     $scope.isFullScreen = !$scope.isFullScreen;
-    nwin.toggleFullscreen();
   };
 
   $scope.hide = function (){

diff --git a/client/app/side-panel/side-panel.controller.js b/client/app/side-panel/side-panel.controller.js
@@ -1,9 +1,58 @@
 'use strict';
 
 angular.module('fileExplorerApp')
-  .controller('SideBarController', function ($scope) {
+  .controller('SideBarController', function ($scope, $mdDialog, hotkeys) {
+    var trash = require('trash');
+    var rimraf = require('rimraf')
+
     $scope.item = {};
-    $scope.$on('ItemSelected', function(ev, item) {
+    $scope.$on('ItemSelected', function (ev, item) {
       $scope.item = item;
     });
+
+    $scope.deleteItem = function () {
+
+      trash([$scope.item.path], function (err) {
+        console.log(err);
+      });
+    };
+
+    hotkeys.bindTo($scope)
+      .add({
+      combo:'del',
+      callback: function(){
+        $scope.deleteItem();
+      }
+    });
+
+    hotkeys.bindTo($scope)
+      .add({
+      combo: 'shift+del',
+      callback: function(){
+        var confirm = {};
+
+        if ($scope.item.isFolder) {
+          confirm = $mdDialog.confirm()
+            .title('Delete folder')
+            .content('Are you sure you want to permanently delete \'' + $scope.item.name + '\' folder?')
+            .ok('I\'m sure')
+            .cancel('Cancel');
+        }
+        else {
+          confirm = $mdDialog.confirm()
+            .title('Delete file')
+            .content('Are you sure you want to permanently delete \'' + $scope.item.name + '\'?')
+            .ok('I\'m sure')
+            .cancel('Cancel');
+        }
+        $mdDialog.show(confirm).then(function () {
+          rimraf($scope.item.path, function (err){
+            if (err){
+              console.log(err);
+            }
+
+          });
+        });
+      }
+    });
   });
diff --git a/client/app/side-panel/side-panel.html b/client/app/side-panel/side-panel.html
@@ -1,8 +1,10 @@
 <div ng-controller="SideBarController" class="side-panel" flex>
   <md-toolbar class="md-tall tool-bar" layout="row">
     <div flex layout="column" layout-align="space-between start">
-      <div class="md-toolbar-tools">
-        <span></span>
+      <div class="md-toolbar-tools" layout="row" layout-align="end">
+        <md-button ng-click="deleteItem($event)">
+          <i class="mdi mdi-delete"></i>
+        </md-button>
       </div>
       <div class="md-toolbar-tools md-toolbar-tools-bottom">
         <div layout="column">

diff --git a/client/components/explorer/explorer.service.js b/client/components/explorer/explorer.service.js
@@ -30,5 +30,5 @@ angular.module('fileExplorerApp')
     this.setSelectedItems = setSelectedItems;
     this.getSelectedItems = getSelectedItems;
 
-    setCurrentPath('C:');
+    setCurrentPath('C:\\');
   });
diff --git a/client/index.html b/client/index.html
@@ -34,9 +34,9 @@
 <script src="app/side-panel/side-panel.controller.js"></script>
 <script src="components/explorer/explorer.service.js"></script>
 <script src="app/main/side-nav/side-nav.controller.js"></script>
+<script src="app/main/toolbar/toolbar.controller.js"></script>
 <script src="app/main/view/view.controller.js"></script>
 <script src="app/main/view/view.js"></script>
-<script src="app/main/toolbar/toolbar.controller.js"></script>
 <script src="app/common/filters/bytes/nch-bytes.filter.js"></script>
 <!-- endinjector -->
 </body>

diff --git a/client/package.json b/client/package.json
@@ -4,7 +4,7 @@
   "description": "Nachos default file explorer",
   "main": "index.html",
   "window": {
-    "toolbar": true,
+    "toolbar": false,
     "frame": false,
     "position": "center",
     "fullscreen": false,

diff --git a/package.json b/package.json
@@ -38,6 +38,8 @@
     "async": "^0.9.0",
     "lodash": "^3.3.1",
     "native-api": "git://github.com/nachos/native-api",
-    "nw": "^0.12.0"
+    "nw": "^0.12.0",
+    "rimraf": "^2.3.2",
+    "trash": "^1.4.1"
   }
 }