diff --git a/build/main.js b/build/main.js index 0d9dc03..385165a 100644 --- a/build/main.js +++ b/build/main.js @@ -29930,17 +29930,23 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd var _actionsPick = require('actions/pick'); +var _actionsSettings = require('actions/settings'); + +var _actionsSettings2 = _interopRequireDefault(_actionsSettings); + var _store = require('store'); var _store2 = _interopRequireDefault(_store); +var FILTERS = ['image', 'audio', 'video']; + navigator.mozSetMessageHandler('activity', function (request) { if (request.source.name === 'pick') { _store2['default'].dispatch((0, _actionsPick.enable)(request)); } }); -},{"actions/pick":223,"store":"store"}],228:[function(require,module,exports){ +},{"actions/pick":223,"actions/settings":224,"store":"store"}],228:[function(require,module,exports){ 'use strict'; Object.defineProperty(exports, '__esModule', { @@ -31529,7 +31535,7 @@ exports['default'] = { var input = _react2['default'].findDOMNode(this.refs.input); var cwd = _store2['default'].getState().get('cwd'); - var action = (0, _actionsFile.create)(cwd + input.value); + var action = (0, _actionsFile.create)(cwd + '/' + input.value); this.props.dispatch(action); this.props.dispatch((0, _actionsDialog.hideAll)()); this.props.dispatch((0, _actionsFile.active)()); @@ -31540,7 +31546,7 @@ exports['default'] = { var input = _react2['default'].findDOMNode(this.refs.input); var cwd = _store2['default'].getState().get('cwd'); - var action = (0, _actionsFile.create)(cwd + input.value, true); + var action = (0, _actionsFile.create)(cwd + '/' + input.value, true); this.props.dispatch(action); this.props.dispatch((0, _actionsDialog.hideAll)()); this.props.dispatch((0, _actionsFile.active)()); diff --git a/build/manifest.webapp b/build/manifest.webapp index 4e174dd..58dc446 100644 --- a/build/manifest.webapp +++ b/build/manifest.webapp @@ -41,9 +41,6 @@ "pick": { "href": "./index.html", "disposition": "inline", - "filters": { - "type": "*" - }, "returnValue": true } } diff --git a/build/style.css b/build/style.css index f7c4b17..9673bb9 100644 --- a/build/style.css +++ b/build/style.css @@ -280,6 +280,10 @@ button.coming-soon::after { .list .directory i { margin-right: 1.4rem; } +.list .file:active, +.list .directory:active { + background: #f0f0f0; +} .grid .file, .grid .directory { flex: 1 0 30%; @@ -391,6 +395,9 @@ header button::before { color: #9b9b93; pointer-events: none; } +.menu li:active { + background: #f0f0f0; +} nav { display: flex; flex-flow: column; @@ -495,12 +502,15 @@ nav i { .file-list { display: flex; flex-flow: row wrap; - justify-content: space-around; align-content: flex-start; + align-items: flex-start; height: calc(100vh - 14.5rem); overflow-x: hidden; overflow-y: auto; } +.file-list.grid { + justify-content: space-around; +} .dialog { display: flex; flex-flow: column; diff --git a/design/userinterface.sketch b/design/userinterface.sketch index 5136d15..e5d10be 100644 Binary files a/design/userinterface.sketch and b/design/userinterface.sketch differ diff --git a/package.json b/package.json index 69d9a6c..30ae6ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hawk", - "version": "1.1.0", + "version": "1.1.1", "description": "", "main": "index.js", "repository": { diff --git a/src/js/dialogs.js b/src/js/dialogs.js index 953add3..35759f5 100644 --- a/src/js/dialogs.js +++ b/src/js/dialogs.js @@ -16,7 +16,7 @@ export default { let input = React.findDOMNode(this.refs.input); let cwd = store.getState().get('cwd'); - let action = create(cwd + input.value); + let action = create(cwd + '/' + input.value); this.props.dispatch(action); this.props.dispatch(hideAll()); this.props.dispatch(active()); @@ -28,7 +28,7 @@ export default { let input = React.findDOMNode(this.refs.input); let cwd = store.getState().get('cwd'); - let action = create(cwd + input.value, true); + let action = create(cwd + '/' + input.value, true); this.props.dispatch(action); this.props.dispatch(hideAll()); this.props.dispatch(active()); diff --git a/src/less/components/entries.less b/src/less/components/entries.less index 868d5f0..906dc33 100644 --- a/src/less/components/entries.less +++ b/src/less/components/entries.less @@ -17,6 +17,10 @@ i { margin-right: 1.4rem; } + + &:active { + background: @gray; + } } .grid .file, .grid .directory { diff --git a/src/less/components/file-list.less b/src/less/components/file-list.less index a95c99a..e6cd1f6 100644 --- a/src/less/components/file-list.less +++ b/src/less/components/file-list.less @@ -2,11 +2,15 @@ display: flex; flex-flow: row wrap; - justify-content: space-around; align-content: flex-start; + align-items: flex-start; height: ~'calc(100vh - 14.5rem)'; overflow-x: hidden; overflow-y: auto; + + &.grid { + justify-content: space-around; + } } diff --git a/src/less/components/menu.less b/src/less/components/menu.less index db164f2..911a0d7 100644 --- a/src/less/components/menu.less +++ b/src/less/components/menu.less @@ -45,5 +45,9 @@ pointer-events: none; } + + &:active { + background: @gray; + } } } diff --git a/src/manifest.webapp b/src/manifest.webapp index 4e174dd..58dc446 100644 --- a/src/manifest.webapp +++ b/src/manifest.webapp @@ -41,9 +41,6 @@ "pick": { "href": "./index.html", "disposition": "inline", - "filters": { - "type": "*" - }, "returnValue": true } }