Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
ffdb30f
bug _cornerExceedsMapLats, set positive values
themacboy Aug 9, 2022
b7dbb19
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Sep 30, 2022
869e126
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Oct 4, 2022
af745eb
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Oct 7, 2022
23d37d4
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
Oct 13, 2022
ab4252c
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Oct 22, 2022
57d100a
inici OpacitiesAction
themacboy Oct 22, 2022
6c51ae4
actualitzar projecte
themacboy Oct 22, 2022
645dc37
afegir carpeta node_modules
themacboy Oct 22, 2022
1d63e80
intentar carregar llibreries
themacboy Oct 22, 2022
1b6b690
carregar leaflet desde CDN
themacboy Oct 22, 2022
c4fbb7c
afegir icona Opacities
themacboy Oct 22, 2022
311bf9a
posar icona opacities a la barra
themacboy Oct 22, 2022
07c1282
afegir icona opacities, correcció de bugs i rebuild
themacboy Oct 22, 2022
4e54a3d
canvi icona Opacities
themacboy Oct 22, 2022
99210c2
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Oct 23, 2022
60334ee
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Oct 23, 2022
8bfc239
probar el sub-menu
themacboy Oct 23, 2022
cfc2e1f
sub-menu test 1
themacboy Oct 23, 2022
9fd5c2e
sub-menu test 2
themacboy Oct 23, 2022
14e5747
sub-menu test 3
themacboy Oct 23, 2022
02f164f
sub-menu test 4
themacboy Oct 23, 2022
5e57540
sub-menu test 5
themacboy Oct 23, 2022
4753ffb
sub-menu test 6
themacboy Oct 23, 2022
a3264f6
sub-menu test 7
themacboy Oct 23, 2022
a6d0fe7
sub-menu test 8
themacboy Oct 23, 2022
fea2b40
sub-menu test 9
themacboy Oct 23, 2022
e1ac4a3
sub-menu test 10
themacboy Oct 23, 2022
06e5ac5
sub-menu test 11
themacboy Oct 23, 2022
0cc1c5b
sub-menu test 12
themacboy Oct 23, 2022
d87ae98
sub-menu test 13
themacboy Oct 23, 2022
93c529b
sub-menu test 14
themacboy Oct 23, 2022
dcf4b7f
sub-menu test 15
themacboy Oct 23, 2022
1a3b1ad
sub-menu test 16
themacboy Oct 23, 2022
636a623
sub-menu test 17
themacboy Oct 23, 2022
ea8a65c
sub-menu test 18
themacboy Oct 23, 2022
00ec95f
sub-menu test 19
themacboy Oct 23, 2022
eeb9192
sub-menu test 20
themacboy Oct 23, 2022
d1a5928
sub-menu test 21
themacboy Oct 23, 2022
3dd4b18
sub-menu test 22
themacboy Oct 23, 2022
9feff27
sub-menu test 23
themacboy Oct 23, 2022
571bbf9
sub-menu test 24
themacboy Oct 23, 2022
6b5efcd
sub-menu test 25
themacboy Oct 23, 2022
e3b57eb
sub-menu test 26
themacboy Oct 23, 2022
abbe721
sub-menu test 26
themacboy Oct 23, 2022
2cc76f2
sub-menu test 27
themacboy Oct 23, 2022
df794af
sub-menu test 28
themacboy Oct 23, 2022
2df822b
sub-menu test 29
themacboy Oct 23, 2022
906edbf
sub-menu test 30
themacboy Oct 23, 2022
735fd75
sub-menu test 31
themacboy Oct 23, 2022
711d0ae
sub-menu test 32
themacboy Oct 23, 2022
81dc243
sub-menu test 33
themacboy Oct 23, 2022
8e51d8a
sub-menu test 34
themacboy Oct 23, 2022
8e4a634
sub-menu test 35
themacboy Oct 23, 2022
4752dc5
sub-menu test 36
themacboy Oct 23, 2022
791f966
sub-menu test 37
themacboy Oct 23, 2022
bce902c
sub-menu final test, pending a few know issues
themacboy Oct 24, 2022
890f48a
correct Opacities icon, incorrect change when OpacityAction is fired
themacboy Oct 24, 2022
5bd0024
add comment in OpacitiesAction
themacboy Oct 24, 2022
d32e443
correct undesired values in opacities array
themacboy Oct 24, 2022
8a7f225
millorar aplicació dels style al sub-toolbar
themacboy Oct 25, 2022
0c2607b
ajust css text sub-toolbar
themacboy Oct 25, 2022
a407052
ajust css text sub-toolbar
themacboy Oct 25, 2022
0e8fe8e
bug event propagation increase sub-toolbar z-index
themacboy Oct 25, 2022
031c99c
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Oct 25, 2022
5f776ee
re-build after merge for Opacities activation
themacboy Oct 25, 2022
d1b20e0
bug barra colorize mal activada
themacboy Oct 26, 2022
14b40fb
cleaning
themacboy Oct 27, 2022
fc05dfe
rebuild
themacboy Oct 27, 2022
94365f0
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Oct 27, 2022
e349eb2
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Oct 29, 2022
4229533
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Oct 29, 2022
ba1d863
afegir icones
themacboy Oct 29, 2022
fa5cb06
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Nov 2, 2022
6b740d9
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Nov 2, 2022
122b74c
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Nov 7, 2022
45190a2
The Opacities action has been moved up, above the toolbar
themacboy Nov 7, 2022
61c2373
Merge branch 'OpacitiesAction' of https://github.com/themacboy/Leafle…
themacboy Nov 7, 2022
4650ded
correct some mistakes
themacboy Nov 7, 2022
9c58a08
Merge branch 'OpacitiesAction' of https://github.com/themacboy/Leafle…
themacboy Nov 7, 2022
5314481
correct vertical displacement
themacboy Nov 8, 2022
18ec9c3
re-build
themacboy Nov 8, 2022
a4b0fb7
Merge branch 'OpacitiesAction' of https://github.com/themacboy/Leafle…
themacboy Nov 8, 2022
453d7be
incliude CSS overwrites
themacboy Nov 13, 2022
b2a3ccd
Merge branch 'OpacitiesAction' of https://github.com/themacboy/Leafle…
themacboy Nov 13, 2022
289f527
correct _opacity assignement after opacities change
themacboy Nov 13, 2022
cf3d9ea
Merge branch 'OpacitiesAction' of https://github.com/themacboy/Leafle…
themacboy Nov 13, 2022
14bfa90
mini bug
themacboy Nov 13, 2022
f78ad4b
Merge branch 'OpacitiesAction' of https://github.com/themacboy/Leafle…
themacboy Nov 13, 2022
3b5b58f
correct custom CSSStyleSheet
themacboy Nov 14, 2022
2f8bec9
Merge branch 'OpacitiesAction' of https://github.com/themacboy/Leafle…
themacboy Nov 14, 2022
54908c8
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Nov 21, 2022
2edcdb0
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Dec 6, 2022
90bd363
run build
themacboy Dec 6, 2022
e56be37
Merge branch 'OpacitiesAction' of https://github.com/themacboy/Leafle…
themacboy Dec 6, 2022
da333d0
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Jan 17, 2023
f4714b5
rebuild
themacboy Jan 17, 2023
5ae257e
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Feb 6, 2023
ffeb8ef
Bump @babel/core from 7.20.5 to 7.21.3
dependabot[bot] Mar 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ package-lock.json
dist/*
!dist/leaflet.distortableimage.css
!dist/leaflet.distortableimage.js
!dist/vendor.js
!dist/vendor.css
!dist/leaflet.distortableimage.js.map
1 change: 1 addition & 0 deletions assets/icons/svg-min/opacities.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/icons/svg/opacities.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions assets/icons/symbol/sprite.symbol.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
.svg-lock-dims { width: 18px; height: 18px; }
.svg-opacity-dims { width: 18px; height: 18px; }
.svg-opacity_empty-dims { width: 14px; height: 18px; }
.svg-opacities-dims { width: 14px; height: 18px; }
.svg-restore-dims { width: 18px; height: 18px; }
.svg-rotate-dims { width: 18px; height: 18px; }
.svg-scale-dims { width: 18px; height: 18px; }
Expand Down Expand Up @@ -76,6 +77,7 @@
<symbol viewBox="0 0 18 18" id="lock"><path d="M13.5 6h-.75V4.5C12.75 2.43 11.07.75 9 .75 6.93.75 5.25 2.43 5.25 4.5V6H4.5C3.675 6 3 6.675 3 7.5V15c0 .825.675 1.5 1.5 1.5h9c.825 0 1.5-.675 1.5-1.5V7.5c0-.825-.675-1.5-1.5-1.5zM6.75 4.5A2.247 2.247 0 019 2.25a2.247 2.247 0 012.25 2.25V6h-4.5V4.5zM13.5 15h-9V7.5h9V15zM9 12.75c.825 0 1.5-.675 1.5-1.5s-.675-1.5-1.5-1.5-1.5.675-1.5 1.5.675 1.5 1.5 1.5z"/></symbol>
<symbol viewBox="0 0 18 18" id="opacity"><path d="M13.245 6L9 1.763 4.755 6A6.015 6.015 0 003 10.23c0 1.5.585 3.082 1.755 4.252a5.993 5.993 0 008.49 0A6.066 6.066 0 0015 10.23c0-1.5-.585-3.06-1.755-4.23zM4.5 10.5c.008-1.5.465-2.453 1.32-3.3L9 3.952l3.18 3.285c.855.84 1.313 1.763 1.32 3.263h-9z"/></symbol>
<symbol viewBox="0 0 14 18" id="opacity_empty"><path stroke="#0078A8" stroke-width="1.7" d="M10.708 6.25A5.113 5.113 0 0112.2 9.846c0 1.275-.497 2.62-1.492 3.614a5.094 5.094 0 01-7.216 0A5.156 5.156 0 012 9.846c0-1.275.497-2.601 1.492-3.596L7.1 2.648l3.608 3.602zm0 0L7.1 2.648 3.492 6.25A5.113 5.113 0 002 9.846c0 1.275.497 2.62 1.492 3.614a5.094 5.094 0 007.216 0A5.156 5.156 0 0012.2 9.846a5.113 5.113 0 00-1.492-3.596z"/></symbol>
<symbol viewBox="0 0 14 18" id="opacities"><g fill="#0078a8"><path d="m2.1 10.85c.2.98.68 1.89 1.39 2.61 0 0 .01.01.01.01.99.99 2.3 1.49 3.6 1.49h.01c1.3 0 2.6-.5 3.59-1.5.73-.73 1.19-1.66 1.39-2.61z" opacity=".75"/><path d="m2 9.85c0 .34.04.68.1 1.01h9.99c.07-.34.11-.67.11-1.01 0-1.13-.4-2.21-1.08-3.09h-8.04c-.7.91-1.08 2.01-1.08 3.09z" opacity=".5"/><path d="m3.08 6.75h8.03c-.13-.17-.26-.35-.41-.5l-3.6-3.6-3.61 3.6c-.15.16-.27.33-.41.5z" opacity=".25"/></g><path d="m10.71 6.25c.95.96 1.49 2.25 1.49 3.6 0 1.27-.5 2.62-1.49 3.61-1.99 1.99-5.21 2-7.2.01 0 0-.01-.01-.01-.01-.96-.96-1.5-2.26-1.5-3.61 0-1.27.5-2.6 1.49-3.6l3.61-3.6z" fill="none" stroke="#0078a8" stroke-width=".1"/><path d="m10.71 6.25c.95.96 1.49 2.25 1.49 3.6 0 1.27-.5 2.62-1.49 3.61-1.99 1.99-5.21 2-7.2.01 0 0-.01-.01-.01-.01-.96-.96-1.5-2.26-1.5-3.61 0-1.27.5-2.6 1.49-3.6l3.61-3.6z" fill="none" stroke="#0078a8" stroke-width="1.7"/></symbol>
<symbol viewBox="0 0 18 18" id="restore"><path d="M15.67 3.839a.295.295 0 00-.22.103l-5.116 3.249V4.179a.342.342 0 00-.193-.315.29.29 0 00-.338.078L3.806 7.751v-4.63h-.002l.002-.022c0-.277-.204-.502-.456-.502h-.873V2.6c-.253 0-.457.225-.457.503l.002.026v10.883h.005c.021.257.217.454.452.455l.016-.002h.822c.013.001.025.004.038.004.252 0 .457-.225.457-.502a.505.505 0 00-.006-.068V9.318l6.001 3.811a.288.288 0 00.332.074.34.34 0 00.194-.306V9.878l5.12 3.252a.288.288 0 00.332.073.34.34 0 00.194-.306V4.18a.358.358 0 00-.09-.24.296.296 0 00-.218-.1z"/></symbol>
<symbol viewBox="0 0 18 18" id="rotate"><path d="M5.505 4.808L.645 9.675l4.867 4.86 4.868-4.86-4.875-4.868zM2.768 9.675L5.513 6.93 8.25 9.675 5.505 12.42 2.768 9.675zM14.52 4.98A6.713 6.713 0 009.75 3V.57L6.57 3.75l3.18 3.18V4.5a5.23 5.23 0 013.713 1.537 5.255 5.255 0 010 7.426 5.23 5.23 0 01-5.843 1.08L6.503 15.66a6.76 6.76 0 003.247.84c1.725 0 3.457-.66 4.77-1.98a6.735 6.735 0 000-9.54z"/></symbol>
<symbol viewBox="0 0 18 18" id="scale"><path d="M8.25 9h-6a.75.75 0 00-.75.75v6c0 .414.336.75.75.75h6a.75.75 0 00.75-.75v-6A.75.75 0 008.25 9zm-.75 6H3v-4.5h4.5V15zm8.94-13.035a.75.75 0 00-.405-.405.75.75 0 00-.285-.06h-4.5a.75.75 0 000 1.5h2.692L9.967 6.968a.75.75 0 000 1.064.75.75 0 001.065 0L15 4.057V6.75a.75.75 0 101.5 0v-4.5a.75.75 0 00-.06-.285z"/></symbol>
Expand Down Expand Up @@ -275,6 +277,17 @@ <h2>opacity</h2>
</div>
<h2>opacity_empty</h2>
</li>
<li title="opacities">
<div class="icon-box">

<!-- opacities -->
<svg class="svg-opacities-dims">
<use xlink:href="#opacities"></use>
</svg>

</div>
<h2>opacities</h2>
</li>
<li title="restore">
<div class="icon-box">

Expand Down Expand Up @@ -516,6 +529,17 @@ <h2>opacity</h2>
</div>
<h2>opacity_empty</h2>
</li>
<li title="opacities">
<div class="icon-box">

<!-- opacities -->
<svg class="svg-opacities-dims">
<use xlink:href="sprite.symbol.svg#opacities"></use>
</svg>

</div>
<h2>opacities</h2>
</li>
<li title="restore">
<div class="icon-box">

Expand Down
2 changes: 1 addition & 1 deletion assets/icons/symbol/sprite.symbol.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions dist/leaflet.distortableimage.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/vendor.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/vendor.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<meta http-equiv="x-ua-compatible" content="ie=edge"/>

<link rel="stylesheet" href="../node_modules/leaflet/dist/leaflet.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.2/leaflet.min.css">
<link rel="stylesheet" href="../dist/vendor.css">
<link rel="stylesheet" href="../dist/leaflet.distortableimage.css" media="screen" title="no title">
<link rel="stylesheet" href="https://unpkg.com/leaflet-control-geocoder/dist/Control.Geocoder.css" />

<script src="../node_modules/leaflet/dist/leaflet.js" type="text/javascript" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.9.2/leaflet.js" type="text/javascript" charset="utf-8"></script>
<script src="../dist/vendor.js"></script>
<script src="../dist/leaflet.distortableimage.js"></script>
<script src="./js/index.js" defer></script>
Expand Down
Loading