-
-
-
+
+
@@ -50,6 +50,8 @@ export default class Root extends Component {
+
+
Hello! Tap each highlighted button to get an understanding of how they work.
diff --git a/src/js/menus.js b/src/js/menus.js
index a6b4231..fdc8620 100644
--- a/src/js/menus.js
+++ b/src/js/menus.js
@@ -11,7 +11,7 @@ const entryMenu = {
action() {
let files = store.getState().get('files');
let active = store.getState().get('activeFile');
- const description = `Enter the new name for ${active[0].name}?`;
+ const description = `Enter the new name for ${active[0].name}`;
store.dispatch(hideAll());
store.dispatch(show('renameDialog', {description}));
diff --git a/src/js/reducers/files.js b/src/js/reducers/files.js
index 2bb4ff2..f076420 100644
--- a/src/js/reducers/files.js
+++ b/src/js/reducers/files.js
@@ -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);
diff --git a/src/js/reducers/settings.js b/src/js/reducers/settings.js
index f81160d..5c07144 100644
--- a/src/js/reducers/settings.js
+++ b/src/js/reducers/settings.js
@@ -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;
diff --git a/src/js/reducers/spinner.js b/src/js/reducers/spinner.js
index 3046b9f..451466d 100644
--- a/src/js/reducers/spinner.js
+++ b/src/js/reducers/spinner.js
@@ -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;
diff --git a/src/js/store.js b/src/js/store.js
index 6073c51..3b6762b 100644
--- a/src/js/store.js
+++ b/src/js/store.js
@@ -7,6 +7,7 @@ import dialogs from './dialogs';
const DEFAULT = new Immutable.Map(Object.assign({
dir: '',
+ settings: JSON.parse(localStorage.getItem('settings') || '{}')
}, dialogs, menus));
let store = createStore(reducers, DEFAULT);
diff --git a/src/js/tour.js b/src/js/tour.js
index e5b0813..692b1e2 100644
--- a/src/js/tour.js
+++ b/src/js/tour.js
@@ -4,7 +4,8 @@ const MESSAGES = {
'icon-select': 'Select files for batch actions',
'icon-more': 'Actions used on selected files such as Copy, Delete, Move, …',
'drawer': 'Extra options, tools and links are here',
- 'icon-search': 'Search your storage for a certain file'
+ 'icon-search': 'Search your storage for a certain file',
+ 'swipe-instruction': 'Swipe from left to right to go to parent folder'
}
const DIALOG_HIDE_DELAY = 2000;
diff --git a/src/less/styles/tour.less b/src/less/styles/tour.less
index 1f422d1..8882bc1 100644
--- a/src/less/styles/tour.less
+++ b/src/less/styles/tour.less
@@ -49,6 +49,40 @@
animation: pulse 2s ease-out infinite;
}
+ .swipe-instruction {
+ position: fixed;
+ left: 50%;
+ top: 20%;
+
+ width: 70vw;
+ height: 5rem;
+
+ margin-left: -35vw;
+
+ z-index: 1;
+
+ background: white;
+
+ border-radius: 3rem;
+
+ &::before {
+ content: '';
+
+ position: absolute;
+ left: 0;
+ top: 0;
+
+ width: 5rem;
+ height: 5rem;
+
+ background: darken(white, 15);
+
+ border-radius: 50%;
+
+ animation: swipe 3s ease infinite;
+ }
+ }
+
.tour-dialog {
display: block;
@@ -86,3 +120,22 @@
transform: scale(5);
}
}
+
+@keyframes swipe {
+ 80% {
+ left: ~'calc(100% - 5rem)';
+ opacity: 1;
+ }
+ 90% {
+ opacity: 0;
+ left: ~'calc(100% - 5rem)';
+ }
+ 91% {
+ left: 0;
+ opacity: 0;
+ }
+ 100% {
+ left: 0;
+ opacity: 1;
+ }
+}
diff --git a/src/manifest.webapp b/src/manifest.webapp
index 8fe3383..509526c 100644
--- a/src/manifest.webapp
+++ b/src/manifest.webapp
@@ -1,7 +1,7 @@
{
"version": "0.1.0",
"name": "Hawk",
- "description": "Keep an eye on your files with a full-featured file-manager",
+ "description": "Keep an eye on your files with a full-featured file manager",
"launch_path": "/index.html",
"icons": {
"16": "/icon/Icon-16.png",
@@ -15,13 +15,26 @@
},
"type": "privileged",
"permissions": {
- "device-storage:sdcard": {"access": "readwrite"},
- "device-storage:videos": {"access": "readwrite"},
- "device-storage:pictures": {"access": "readwrite"},
- "device-storage:music": {"access": "readwrite"}
+ "device-storage:sdcard": {
+ "access": "readwrite",
+ "description": "We need access to your files in order to give you the functionality of listing, reading, opening and writing files in your storage"
+ },
+ "device-storage:videos": {
+ "access": "readwrite",
+ "description": "We need access to your files in order to give you the functionality of listing, reading, opening and writing files in your storage"
+ },
+ "device-storage:pictures": {
+ "access": "readwrite",
+ "description": "We need access to your files in order to give you the functionality of listing, reading, opening and writing files in your storage"
+ },
+ "device-storage:music": {
+ "access": "readwrite",
+ "description": "We need access to your files in order to give you the functionality of listing, reading, opening and writing files in your storage"
+ }
},
"installs_allowed_from": [
- "marketplace.firefox.com"
+ "https://marketplace.firefox.com",
+ "https://marketplace-dev.allizom.org"
],
"default_locale": "en"
}