fix hawk: a lot of bugfixes here and there

This commit is contained in:
Mahdi Dibaiee
2015-09-07 01:02:40 +04:30
parent d3d539abac
commit dea2e7591c
26 changed files with 282 additions and 1702 deletions

View File

@@ -46,7 +46,8 @@ export default function(state = [], action) {
if (action.type === RENAME_FILE) {
let all = Promise.all(action.file.map(file => {
return move(file, (file.path || '') + action.name);
let cwd = store.getState().get('cwd');
return move(file, cwd + '/' + action.name);
}));
all.then(boundRefresh, reportError);

View File

@@ -8,7 +8,11 @@ const DEFAULT = {
export default function(state = DEFAULT, action) {
if (action.type === SETTINGS) {
return Object.assign({}, state, omit(action, 'type'));
let newSettings = Object.assign({}, state, omit(action, 'type'));
localStorage.setItem('settings', JSON.stringify(newSettings));
return newSettings;
}
return state;

View File

@@ -1,4 +1,5 @@
import { SPINNER, CHANGE_DIRECTORY, LIST_FILES, REFRESH, DIALOG, CREATE_FILE, DELETE_FILE } from 'actions/types';
import { SPINNER, CHANGE_DIRECTORY, LIST_FILES, REFRESH, DIALOG, SETTINGS,
CREATE_FILE, DELETE_FILE, RENAME_FILE, MOVE_FILE, COPY_FILE, SEARCH} from 'actions/types';
export default function(state = false, action) {
if (action.type === SPINNER) {
@@ -12,6 +13,13 @@ export default function(state = false, action) {
switch (action.type) {
case CHANGE_DIRECTORY:
case REFRESH:
case SETTINGS:
case CREATE_FILE:
case MOVE_FILE:
case DELETE_FILE:
case RENAME_FILE:
case COPY_FILE:
case SEARCH:
return true;
case LIST_FILES:
return false;