usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✌️

This commit is contained in:
syuilo 2018-03-03 16:39:53 +09:00
parent bc208ce854
commit a8f6908940
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/web/app/desktop/api/choose-drive-file.ts
View File

@ -23,7 +23,7 @@ export default function(opts) {
}; };
window.open(url + '/selectdrive', window.open(url + '/selectdrive',
'drive_window', 'choose_drive_window',
'height=500, width=800'); 'height=500, width=800');
} }
}); });

7
src/web/app/desktop/views/components/drive.vue
View File

@ -62,6 +62,7 @@ import XFolder from './drive.folder.vue';
import XFile from './drive.file.vue'; import XFile from './drive.file.vue';
import contains from '../../../common/scripts/contains'; import contains from '../../../common/scripts/contains';
import contextmenu from '../../api/contextmenu'; import contextmenu from '../../api/contextmenu';
import { url } from '../../../config';
export default Vue.extend({ export default Vue.extend({
components: { components: {
@ -389,9 +390,15 @@ export default Vue.extend({
}, },
newWindow(folder) { newWindow(folder) {
if (document.body.clientWidth > 800) {
(this as any).os.new(MkDriveWindow, { (this as any).os.new(MkDriveWindow, {
folder: folder folder: folder
}); });
} else {
window.open(url + '/i/drive/folder/' + folder.id,
'drive_window',
'height=500, width=800');
}
}, },
move(target) { move(target) {