Skip to content

Commit 39beac3

Browse files
authored
Merge pull request #1097 from neomjs/dev
1.3.53
2 parents 2901099 + a095085 commit 39beac3

File tree

8 files changed

+60
-27
lines changed

8 files changed

+60
-27
lines changed

apps/website/data/examples_devmode.json

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"browsers" : ["Chrome v83+ (SharedWorkers)"],
44
"environments": ["Desktop"],
5-
"id" : 16,
5+
"id" : 17,
66
"image" : "devmode/sharedcovid.png",
77
"name" : "Multi Window Covid App",
88
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/sharedcovid",
@@ -11,7 +11,7 @@
1111
{
1212
"browsers" : ["Chrome"],
1313
"environments": ["Desktop"],
14-
"id" : 15,
14+
"id" : 16,
1515
"image" : "devmode/calendar-preview.png",
1616
"name" : "Calendar Sneak Preview",
1717
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/src/calendar",
@@ -20,7 +20,7 @@
2020
{
2121
"browsers" : ["Chrome"],
2222
"environments": ["Desktop"],
23-
"id" : 14,
23+
"id" : 15,
2424
"image" : "devmode/covidDashboard.png",
2525
"name" : "Covid Dashboard",
2626
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/covid",
@@ -29,7 +29,7 @@
2929
{
3030
"browsers" : ["Chrome"],
3131
"environments": ["Desktop"],
32-
"id" : 13,
32+
"id" : 14,
3333
"image" : "devmode/realworldApp.png",
3434
"name" : "RealWorld App",
3535
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/realworld",
@@ -38,7 +38,7 @@
3838
{
3939
"browsers" : ["Chrome"],
4040
"environments": ["Desktop"],
41-
"id" : 12,
41+
"id" : 13,
4242
"image" : "devmode/coronaGallery.png",
4343
"name" : "COVID-19 Gallery",
4444
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/component/coronaGallery",
@@ -47,7 +47,7 @@
4747
{
4848
"browsers" : ["Chrome"],
4949
"environments": ["Desktop"],
50-
"id" : 11,
50+
"id" : 12,
5151
"image" : "devmode/coronaHelix.png",
5252
"name" : "COVID-19 Helix",
5353
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/component/coronaHelix",
@@ -56,7 +56,7 @@
5656
{
5757
"browsers" : ["Chrome"],
5858
"environments": ["Desktop"],
59-
"id" : 10,
59+
"id" : 11,
6060
"image" : "devmode/website.png",
6161
"name" : "Neo Website App",
6262
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/website",
@@ -65,12 +65,21 @@
6565
{
6666
"browsers" : ["Chrome"],
6767
"environments": ["Desktop"],
68-
"id" : 9,
68+
"id" : 10,
6969
"image" : "devmode/tableFiltering.png",
7070
"name" : "Table Filtering",
7171
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/tableFiltering",
7272
"url" : "https://neomjs.github.io/pages/node_modules/neo.mjs/examples/tableFiltering/"
7373
},
74+
{
75+
"browsers" : ["Chrome"],
76+
"environments": ["Desktop"],
77+
"id" : 9,
78+
"image" : "devmode/dragdrop.png",
79+
"name" : "Dialog drag&drop",
80+
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/dialog",
81+
"url" : "https://neomjs.github.io/pages/node_modules/neo.mjs/examples/dialog/"
82+
},
7483
{
7584
"browsers" : ["Chrome"],
7685
"environments": ["Desktop"],

apps/website/data/examples_dist_dev.json

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
44
"environments": ["Desktop"],
5-
"id" : 14,
5+
"id" : 15,
66
"image" : "devmode/calendar-preview.png",
77
"name" : "Calendar Sneak Preview",
88
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/src/calendar",
@@ -11,7 +11,7 @@
1111
{
1212
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
1313
"environments": ["Desktop"],
14-
"id" : 13,
14+
"id" : 14,
1515
"image" : "devmode/covidDashboard.png",
1616
"name" : "Covid Dashboard",
1717
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/covid",
@@ -20,7 +20,7 @@
2020
{
2121
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
2222
"environments": ["Desktop"],
23-
"id" : 12,
23+
"id" : 13,
2424
"image" : "devmode/realworldApp.png",
2525
"name" : "RealWorld App",
2626
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/realworld",
@@ -29,7 +29,7 @@
2929
{
3030
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
3131
"environments": ["Desktop"],
32-
"id" : 11,
32+
"id" : 12,
3333
"image" : "devmode/coronaGallery.png",
3434
"name" : "COVID-19 Gallery",
3535
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/component/coronaGallery",
@@ -38,7 +38,7 @@
3838
{
3939
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
4040
"environments": ["Desktop"],
41-
"id" : 10,
41+
"id" : 11,
4242
"image" : "devmode/coronaHelix.png",
4343
"name" : "COVID-19 Helix",
4444
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/component/coronaHelix",
@@ -47,7 +47,7 @@
4747
{
4848
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
4949
"environments": ["Desktop", "Mobile"],
50-
"id" : 9,
50+
"id" : 10,
5151
"image" : "devmode/website.png",
5252
"name" : "Neo Website App",
5353
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/website",
@@ -56,12 +56,21 @@
5656
{
5757
"browsers" : ["Chrome"],
5858
"environments": ["Desktop"],
59-
"id" : 8,
59+
"id" : 9,
6060
"image" : "devmode/tableFiltering.png",
6161
"name" : "Table Filtering",
6262
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/tableFiltering",
6363
"url" : "https://neomjs.github.io/pages/node_modules/neo.mjs/dist/development/examples/tableFiltering/"
6464
},
65+
{
66+
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
67+
"environments": ["Desktop"],
68+
"id" : 8,
69+
"image" : "devmode/dragdrop.png",
70+
"name" : "Dialog drag&drop",
71+
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/dialog",
72+
"url" : "https://neomjs.github.io/pages/node_modules/neo.mjs/dist/development/examples/dialog/"
73+
},
6574
{
6675
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
6776
"environments": ["Desktop"],

apps/website/data/examples_dist_prod.json

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
44
"environments": ["Desktop"],
5-
"id" : 14,
5+
"id" : 15,
66
"image" : "devmode/calendar-preview.png",
77
"name" : "Calendar Sneak Preview",
88
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/src/calendar",
@@ -11,7 +11,7 @@
1111
{
1212
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
1313
"environments": ["Desktop"],
14-
"id" : 13,
14+
"id" : 14,
1515
"image" : "devmode/covidDashboard.png",
1616
"name" : "Covid Dashboard",
1717
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/covid",
@@ -20,7 +20,7 @@
2020
{
2121
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
2222
"environments": ["Desktop"],
23-
"id" : 12,
23+
"id" : 13,
2424
"image" : "devmode/realworldApp.png",
2525
"name" : "RealWorld App",
2626
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/realworld",
@@ -29,7 +29,7 @@
2929
{
3030
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
3131
"environments": ["Desktop"],
32-
"id" : 11,
32+
"id" : 12,
3333
"image" : "devmode/coronaGallery.png",
3434
"name" : "COVID-19 Gallery",
3535
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/component/coronaGallery",
@@ -38,7 +38,7 @@
3838
{
3939
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
4040
"environments": ["Desktop"],
41-
"id" : 10,
41+
"id" : 11,
4242
"image" : "devmode/coronaHelix.png",
4343
"name" : "COVID-19 Helix",
4444
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/component/coronaHelix",
@@ -47,7 +47,7 @@
4747
{
4848
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
4949
"environments": ["Desktop", "Mobile"],
50-
"id" : 9,
50+
"id" : 10,
5151
"image" : "devmode/website.png",
5252
"name" : "Neo Website App",
5353
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/apps/website",
@@ -56,12 +56,21 @@
5656
{
5757
"browsers" : ["Chrome"],
5858
"environments": ["Desktop"],
59-
"id" : 8,
59+
"id" : 9,
6060
"image" : "devmode/tableFiltering.png",
6161
"name" : "Table Filtering",
6262
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/tableFiltering",
6363
"url" : "https://neomjs.github.io/pages/node_modules/neo.mjs/dist/production/examples/tableFiltering/"
6464
},
65+
{
66+
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
67+
"environments": ["Desktop"],
68+
"id" : 8,
69+
"image" : "devmode/dragdrop.png",
70+
"name" : "Dialog drag&drop",
71+
"sourceUrl" : "https://github.com/neomjs/neo/tree/dev/examples/dialog",
72+
"url" : "https://neomjs.github.io/pages/node_modules/neo.mjs/dist/production/examples/dialog/"
73+
},
6574
{
6675
"browsers" : ["Chrome", "Edge", "Firefox", "Safari"],
6776
"environments": ["Desktop"],

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neo.mjs",
3-
"version": "1.3.51",
3+
"version": "1.3.53",
44
"description": "The webworkers driven UI framework",
55
"repository": {
66
"type": "git",

resources/scss/src/dialog/_Base.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@
6363
.neo-panel-header-text {
6464
color : v(dialog-header-color);
6565
pointer-events: none;
66+
user-drag : none; // not supported yet
6667
user-select : none;
68+
69+
-webkit-user-drag: none;
6770
}
6871
}
6972
}

src/component/Label.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ class Label extends Component {
2929
* @member {Object} _vdom={tag: 'label'}
3030
*/
3131
_vdom: {
32-
tag: 'label'
32+
tag : 'label',
33+
draggable: false
3334
}
3435
}}
3536

src/main/DomEvents.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ class DomEvents extends Base {
242242
}
243243

244244
getEventData(event) {
245-
let path = event.path || event.composedPath(); // FF does not support composedPath()
245+
let path = event.path || event.composedPath(); // FF does not support path
246246

247247
return {
248248
path : path.map(e => this.getTargetData(e)),

src/main/addon/DragDrop.mjs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,16 @@ class DragDrop extends Base {
111111
* @returns {Object}
112112
*/
113113
getEventData(event) {
114+
const path = event.path || event.composedPath();
115+
114116
const e = {
115117
...DomEvents.getEventData(event.detail.originalEvent),
116118
clientX: event.detail.clientX,
117119
clientY: event.detail.clientY
118120
};
119121

120-
e.targetPath = e.path;
121-
e.path = event.path.map(e => DomEvents.getTargetData(e))
122+
e.targetPath = e.path || e.composedPath();
123+
e.path = path.map(e => DomEvents.getTargetData(e))
122124

123125
return e;
124126
}

0 commit comments

Comments
 (0)