Skip to content

Commit cfc5528

Browse files
committed
merge stable, update build
2 parents b41a72c + 8d4d347 commit cfc5528

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

dist/leaflet-src.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ L.DomUtil = {
756756
value = Math.round(value * 100);
757757

758758
if (filter) {
759-
filter.Enabled = (value === 100);
759+
filter.Enabled = (value !== 100);
760760
filter.Opacity = value;
761761
} else {
762762
el.style.filter += ' progid:' + filterName + '(opacity=' + value + ')';
@@ -5401,11 +5401,6 @@ L.Draggable = L.Class.extend({
54015401
return;
54025402
}
54035403

5404-
if (!L.Browser.touch) {
5405-
L.DomUtil.disableTextSelection();
5406-
this._setMovingCursor();
5407-
}
5408-
54095404
this._startPos = this._newPos = L.DomUtil.getPosition(this._element);
54105405
this._startPoint = new L.Point(first.clientX, first.clientY);
54115406

@@ -5427,6 +5422,11 @@ L.Draggable = L.Class.extend({
54275422
if (!this._moved) {
54285423
this.fire('dragstart');
54295424
this._moved = true;
5425+
5426+
if (!L.Browser.touch) {
5427+
L.DomUtil.disableTextSelection();
5428+
this._setMovingCursor();
5429+
}
54305430
}
54315431

54325432
this._newPos = this._startPos.add(diffVec);

dist/leaflet.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/dom/Draggable.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ L.Draggable = L.Class.extend({
6060
return;
6161
}
6262

63-
if (!L.Browser.touch) {
64-
L.DomUtil.disableTextSelection();
65-
this._setMovingCursor();
66-
}
67-
6863
this._startPos = this._newPos = L.DomUtil.getPosition(this._element);
6964
this._startPoint = new L.Point(first.clientX, first.clientY);
7065

@@ -86,6 +81,11 @@ L.Draggable = L.Class.extend({
8681
if (!this._moved) {
8782
this.fire('dragstart');
8883
this._moved = true;
84+
85+
if (!L.Browser.touch) {
86+
L.DomUtil.disableTextSelection();
87+
this._setMovingCursor();
88+
}
8989
}
9090

9191
this._newPos = this._startPos.add(diffVec);

0 commit comments

Comments
 (0)