Skip to content

Commit 1eb9cdf

Browse files
committed
Breadcrumb directory navigation issue fixed
1 parent 8efbda0 commit 1eb9cdf

File tree

3 files changed

+31
-18
lines changed

3 files changed

+31
-18
lines changed

src/core/fm/action/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ const FMAction = class FMAction extends Component {
128128

129129
<Button icon="swap" onClick={this.props.fm_store.selectPlugin('move')} disabled={!selected}>Move</Button>
130130

131-
<Button icon="delete" onClick={this.showDeleteConfirmation} disabled={!selected}></Button>
131+
<Button icon="delete" onClick={this.showDeleteConfirmation} disabled={!selected}/>
132132

133133
<Button icon="reload" onClick={this.props.fm_store.refresh}>Refresh</Button>
134134

src/core/fm/content/index.jsx

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,45 +36,58 @@ const FMContent = class FMContent extends Component {
3636

3737
const ext = item ? (item.is_dir ? 'dir' : item.extension) : 'screen';
3838

39-
this.setState({menu_items: this.getFilteredMenuItems(ext)});
39+
const menu_items = this.getFilteredMenuItems(ext).map(menu_item => {
40+
const {callback} = menu_item;
41+
menu_item.callback = () => {
42+
return callback.call(this, item);
43+
};
44+
return menu_item;
45+
});
46+
47+
this.setState({menu_items});
4048
};
4149

4250
getFilteredMenuItems = ext => {
4351
const menu = [
4452
{
4553
scopes: ['image'],
4654
label: 'Preview',
47-
callback() {
48-
console.log('Image Preview');
49-
}
55+
callback(item) {
56+
console.log('Clicked Details', item);
57+
},
58+
category: ['preview']
5059
},
5160
{
5261
scopes: ['audio'],
5362
label: 'Play',
54-
callback() {
55-
console.log('Play this music');
56-
}
63+
callback(item) {
64+
console.log('Clicked Details', item);
65+
},
66+
category: ['preview']
5767
},
5868
{
5969
scopes: ['dir', 'text'],
6070
label: 'Open',
61-
callback() {
62-
console.log('Clicked Open');
63-
}
71+
callback(item) {
72+
console.log('Clicked Details', item);
73+
},
74+
category: ['preview']
6475
},
6576
{
6677
scopes: ['dir', 'screen'],
6778
label: 'New Folder',
68-
callback() {
69-
console.log("Create new folder");
70-
}
79+
callback(item) {
80+
console.log('Clicked Details', item);
81+
},
82+
category: ['new-item']
7183
},
7284
{
7385
scopes: ['all'],
7486
label: 'Details',
75-
callback() {
76-
console.log('Clicked Details');
77-
}
87+
callback(item) {
88+
console.log('Clicked Details', item);
89+
},
90+
category: ['general']
7891
},
7992
];
8093
const type = ['screen', 'dir'].indexOf(ext) >= 0 ? ext : Object.keys(file_types).find(type => {

src/core/fm/content/item/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default class Item extends Component {
4444

4545
//what happens on double click on an item
4646
if (item.is_dir) {
47-
this.props.store.working_dir = this.props.store.working_dir + item.basename + '/';
47+
this.props.store.working_dir = this.props.store.working_dir + '/' + item.basename;
4848
this.props.store.fetch();
4949
}
5050
else {

0 commit comments

Comments
 (0)