Skip to content

Commit 4f44675

Browse files
committed
upgrade dependencies
1 parent c377c1f commit 4f44675

File tree

6 files changed

+58
-35
lines changed

6 files changed

+58
-35
lines changed

README.md

+11-15
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Compatibility
1919
* Ember CLI v2.13 or above
2020
* Node.js v10 or above
2121

22+
Since version 1.0.0 this addon makes use of glimmer components only.
23+
2224

2325
Installation
2426
------------------------------------------------------------------------------
@@ -36,25 +38,19 @@ check out the [demo page](https://st-h.github.io/ember-file-drop-zone/)
3638
Usage
3739
------------------------------------------------------------------------------
3840

39-
Ember file drop-zone provides both a mixin to add to existing components and a simple component that can be used in block form.
40-
4141
See the source code of the [demo app](tests/dummy/app/) for more complex examples
4242

4343
### Component
4444
```
45-
{{#file-drop-zone onDrop=(action "addFiles")}}
46-
just drop your files here...
47-
{{/file-drop-zone}}
48-
```
49-
50-
### Mixin
51-
```
52-
import Component from '@ember/component';
53-
import DropZone from 'ember-file-drop-zone/mixins/file-drop-zone';
54-
55-
export default Component.extend(DropZone, {
56-
57-
});
45+
<FileDropZone @onDrop={{this.addFiles}} @disabled={{this.dropZoneDisabled}} as |state|>
46+
{#if state.hovering}}
47+
hovering over the dropzone
48+
{{else if state.dragging}}
49+
dragging is active
50+
{{else}}
51+
drop your files here...
52+
{{/if}}
53+
</FileDropZone>
5854
```
5955

6056
### Parameters

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
"ember-cli-dependency-checker": "^3.2.0",
7575
"ember-cli-github-pages": "^0.2.2",
7676
"ember-cli-inject-live-reload": "^2.0.2",
77+
"ember-cli-memory-leak-detector": "^0.7.1",
7778
"ember-cli-sri": "^2.1.1",
7879
"ember-cli-terser": "^4.0.1",
7980
"ember-cli-typescript-blueprints": "^3.0.0",

testem.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
'--disable-dev-shm-usage',
1616
'--disable-software-rasterizer',
1717
'--mute-audio',
18-
'--remote-debugging-port=0',
18+
'--remote-debugging-port=9222',
1919
'--window-size=1440,900',
2020
].filter(Boolean),
2121
},

tests/dummy/app/templates/application.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{{/if}}
1717
</FileDropZone>
1818

19-
<input type="checkbox" id="dropzone-active-checkbox" checked={{readonly this.dropZoneDisabled}} onchange={{action (mut this.dropZoneDisabled) value="target.checked"}}>
19+
<input type="checkbox" id="dropzone-active-checkbox" checked={{readonly this.dropZoneDisabled}} onchange={{fn (mut this.dropZoneDisabled) value="target.checked"}}>
2020
<label for="dropzone-active-checkbox">dropzone disabled</label>
2121

2222
<h3>file drop history</h3>

tests/integration/components/file-drop-zone-test.js

+2-14
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ module('Integration | Component | file-drop-zone', function(hooks) {
100100
assert.equal(files.length, 1);
101101
assert.equal('test-file', files[0].name, 'dropped file name matches parameter provided by action')
102102
})
103-
await render(hbs`{{file-drop-zone onDrop=onDrop}}`);
103+
await render(hbs`{{file-drop-zone onDrop=this.onDrop}}`);
104104

105105
const editable = this.element.getElementsByClassName('ember-file-drop-zone')[0];
106106
await editable.dispatchEvent(createDropEvent()); // paste mock event
@@ -113,24 +113,12 @@ module('Integration | Component | file-drop-zone', function(hooks) {
113113
assert.equal(files.length, 1);
114114
assert.equal('test-file-interface', files[0].name, 'dropped file name matches parameter provided by action')
115115
})
116-
await render(hbs`{{file-drop-zone onDrop=onDrop}}`);
116+
await render(hbs`{{file-drop-zone onDrop=this.onDrop}}`);
117117

118118
const editable = this.element.getElementsByClassName('ember-file-drop-zone')[0];
119119
await editable.dispatchEvent(createDropEvent(true)); // paste mock event
120120
});
121121

122-
// test('dragging files into window should set dragging, window leave should reset', async function(assert) {
123-
// assert.expect(4);
124-
// await render(hbs`{{file-drop-zone dragging=this.dragging _windowEnteredCounter=counter}}`);
125-
// await window.dispatchEvent(createWindowDragEnterEvent()); // paste mock event
126-
// assert.ok(this.dragging);
127-
// assert.equal(this.counter, 1, 'window enter counter should be incremented');
128-
129-
// await window.dispatchEvent(createWindowDragLeaveEvent()); // paste mock event
130-
// assert.notOk(this.dragging);
131-
// assert.equal(this.counter, 0, 'window enter counter should be reset');
132-
// });
133-
134122
test('dragging files over dropzone should trigger action and set hovering', async function(assert) {
135123
await render(hbs`
136124
<FileDropZone @onDragEnter={{this.onDragEnter}} as |state|>

yarn.lock

+42-4
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
chalk "^2.0.0"
259259
js-tokens "^4.0.0"
260260

261-
"@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.16", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
261+
"@babel/parser@^7.12.10", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.16", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
262262
version "7.13.16"
263263
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
264264
integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
@@ -2294,6 +2294,13 @@ [email protected]:
22942294
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
22952295
integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
22962296

2297+
ast-types@^0.14.2:
2298+
version "0.14.2"
2299+
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
2300+
integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
2301+
dependencies:
2302+
tslib "^2.0.1"
2303+
22972304
astral-regex@^2.0.0:
22982305
version "2.0.0"
22992306
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -4333,6 +4340,14 @@ chownr@~1.0.1:
43334340
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
43344341
integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
43354342

4343+
chrome-remote-interface@^0.28.2:
4344+
version "0.28.2"
4345+
resolved "https://registry.yarnpkg.com/chrome-remote-interface/-/chrome-remote-interface-0.28.2.tgz#6be3554d2c227ff07eb74baa7e5d4911da12a5a6"
4346+
integrity sha512-F7mjof7rWvRNsJqhVXuiFU/HWySCxTA9tzpLxUJxVfdLkljwFJ1aMp08AnwXRmmP7r12/doTDOMwaNhFCJsacw==
4347+
dependencies:
4348+
commander "2.11.x"
4349+
ws "^7.2.0"
4350+
43364351
chrome-trace-event@^1.0.2:
43374352
version "1.0.3"
43384353
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -4569,6 +4584,11 @@ combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.5, combined
45694584
dependencies:
45704585
delayed-stream "~1.0.0"
45714586

4587+
4588+
version "2.11.0"
4589+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
4590+
integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==
4591+
45724592
45734593
version "2.8.1"
45744594
resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -5448,7 +5468,7 @@ ember-cli-github-pages@^0.2.2:
54485468
ember-cli-version-checker "^2.1.0"
54495469
rsvp "^4.7.0"
54505470

5451-
ember-cli-htmlbars@^5.7.1:
5471+
ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.7.1:
54525472
version "5.7.1"
54535473
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.1.tgz#eb5b88c7d9083bc27665fb5447a9b7503b32ce4f"
54545474
integrity sha512-9laCgL4tSy48orNoQgQKEHp93MaqAs9ZOl7or5q+8iyGGJHW6sVXIYrVv5/5O9HfV6Ts8/pW1rSoaeKyLUE+oA==
@@ -5488,6 +5508,19 @@ ember-cli-lodash-subset@^2.0.1:
54885508
resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
54895509
integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
54905510

5511+
ember-cli-memory-leak-detector@^0.7.1:
5512+
version "0.7.1"
5513+
resolved "https://registry.yarnpkg.com/ember-cli-memory-leak-detector/-/ember-cli-memory-leak-detector-0.7.1.tgz#d2761c40ac929d0f330a8184fc92ff34c14a4c4f"
5514+
integrity sha512-jzNtRlE/sl8lVg9JUPSGJ7bJHUHOn1DSwMokvT+DyKt29XJcoAOH/ewQgk3QzszYxBx6koMizU6RdoXn6PBGwQ==
5515+
dependencies:
5516+
"@babel/parser" "^7.12.10"
5517+
ast-types "^0.14.2"
5518+
chrome-remote-interface "^0.28.2"
5519+
ember-cli-babel "^7.22.1"
5520+
ember-cli-htmlbars "^5.3.1"
5521+
glob "^7.1.6"
5522+
heapsnapshot "0.0.6"
5523+
54915524
ember-cli-normalize-entity-name@^1.0.0:
54925525
version "1.0.0"
54935526
resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7"
@@ -7759,6 +7792,11 @@ hawk@~3.1.3:
77597792
hoek "2.x.x"
77607793
sntp "1.x.x"
77617794

7795+
7796+
version "0.0.6"
7797+
resolved "https://registry.yarnpkg.com/heapsnapshot/-/heapsnapshot-0.0.6.tgz#405e556a619cd5e74de462243d2c8fd02ec38209"
7798+
integrity sha512-P7Vb82VmTyicVAD5xSggWqCxvYu5AbcmnlAkkTpevt7ZPbdhYz21J8zaXZuuT2m6h4fTSP7M0CsVjtwZMJW1Pg==
7799+
77627800
heimdalljs-fs-monitor@^1.1.0:
77637801
version "1.1.0"
77647802
resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-1.1.0.tgz#0ad5aa1dac0a30d5940a74edeea3d515e70225e4"
@@ -13361,7 +13399,7 @@ tslib@^1.9.0:
1336113399
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
1336213400
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
1336313401

13364-
tslib@^2.0.3, tslib@^2.1.0:
13402+
tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0:
1336513403
version "2.2.0"
1336613404
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
1336713405
integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
@@ -14123,7 +14161,7 @@ write-file-atomic@~2.1.0:
1412314161
imurmurhash "^0.1.4"
1412414162
slide "^1.1.5"
1412514163

14126-
ws@^7.4.4, ws@~7.4.2:
14164+
ws@^7.2.0, ws@^7.4.4, ws@~7.4.2:
1412714165
version "7.4.5"
1412814166
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
1412914167
integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==

0 commit comments

Comments
 (0)