Browse Source

Fixed example app.js

Artur Paikin 9 years ago
parent
commit
79b3693768
1 changed files with 7 additions and 12 deletions
  1. 7 12
      website/src/examples/dragdrop/src/js/app.js

+ 7 - 12
website/src/examples/dragdrop/src/js/app.js

@@ -1,13 +1,8 @@
-<<<<<<< HEAD
-import Uppy from '../../../../../src/core';
-import { DragDrop, Tus10 } from '../../../../../src/plugins';
-=======
-// // import Uppy from '../../../../../../src/core';
-// // import { DragDrop, Tus10 } from '../../../../../../src/plugins';
->>>>>>> origin/master
+import Uppy from 'uppy/core';
+import { DragDrop, Tus10 } from 'uppy/plugins';
 
-// const uppy = new Uppy({wait: false});
-// const files = uppy
-//   .use(DragDrop, {selector: '#upload-target'})
-//   .use(Tus10, {endpoint: 'http://master.tus.io:8080'})
-//   .run();
+const uppy = new Uppy({wait: false});
+const files = uppy
+  .use(DragDrop, {selector: '#upload-target'})
+  .use(Tus10, {endpoint: 'http://master.tus.io:8080'})
+  .run();