Skip to content

Commit

Permalink
Merge pull request #13 from LanceGin/dev
Browse files Browse the repository at this point in the history
add: dragging file enter the tray will open the upload window
  • Loading branch information
LanceGin authored Nov 30, 2017
2 parents b79a528 + 98b01e0 commit ba5bc43
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function createWindow() {
useContentSize: true,
width: 400,
titleBarStyle: 'hidden-inset',
resizable: true,
resizable: false,
show: false,
});

Expand Down Expand Up @@ -156,6 +156,7 @@ function createWindow() {
checked: true,
click() {
event.sender.send('setDefaultBucket', bucketTmp);
defaultBucket = bucketTmp;
},
};
} else {
Expand All @@ -164,6 +165,7 @@ function createWindow() {
type: 'radio',
click() {
event.sender.send('setDefaultBucket', bucketTmp);
defaultBucket = bucketTmp;
},
};
}
Expand Down
8 changes: 4 additions & 4 deletions src/renderer/components/BucketList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@
localStorage.db = arg;
});
// send signal and transfer localstorage to the main process
ipcRenderer.send('setKey', key);
// console.log(localStorage.db);
let buckets;
export default {
name: 'bucket-list',
Expand Down Expand Up @@ -115,6 +111,10 @@
localStorage.clear();
this.$router.push({ path: '/login' });
});
// send signal and transfer localstorage to the main process
ipcRenderer.send('setKey', key);
// console.log(localStorage.db);
},
methods: {
// create new bucket
Expand Down

0 comments on commit ba5bc43

Please sign in to comment.