Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add DRAG mode, this let you move object with the handlers and nothing else (ok) #371

Merged
merged 27 commits into from
Sep 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
819d5f3
Add DRAG mode, this let you move object with the handlers and nothing
themacboy Jul 31, 2019
65ff27a
correct error
themacboy Jul 31, 2019
b3febbb
correct NOOB error :)
themacboy Jul 31, 2019
b70f153
correct error (don't understand travis-ci).
themacboy Jul 31, 2019
ff30011
correct The Error uppssss
themacboy Jul 31, 2019
6d2eba0
add Gruntfile changes
themacboy Jul 31, 2019
495f61e
resolve conflicts
sashadev-sky Sep 15, 2019
2f8bc48
resolve conflicts 2
sashadev-sky Sep 15, 2019
7f9ae93
Add Drag Action js file
themacboy Sep 19, 2019
bf205e1
resolve conflict 3
themacboy Sep 19, 2019
f2710fd
resolve conflict 4
themacboy Sep 19, 2019
c0b9f41
resolve conflict 5
sashadev-sky Sep 21, 2019
eeda606
resolve conflit 6
sashadev-sky Sep 21, 2019
d6635e9
resolve conflict 7
sashadev-sky Sep 21, 2019
baa0618
delete
sashadev-sky Sep 21, 2019
788bf1c
clean branch commits parse assets
sashadev-sky Sep 21, 2019
9fe4171
finish rebase
sashadev-sky Sep 21, 2019
d42d699
checkout accidental files
sashadev-sky Sep 21, 2019
525e099
checkout extra file
sashadev-sky Sep 22, 2019
0c71344
gitignore update
themacboy Sep 23, 2019
c0ce517
Merge branch 'main' of https://github.com/publiclab/Leaflet.Distortab…
themacboy Sep 24, 2019
98e82cc
remove .project
themacboy Sep 24, 2019
55e54f5
add Drag icon in assets/icons/svgdrag.svg
themacboy Sep 24, 2019
c90b8cc
add drag.svg to assets/icon/svg-min and addre drag ocon to sprite system
themacboy Sep 24, 2019
8c99254
correction on sprite creation
themacboy Sep 24, 2019
801869f
bump version
sashadev-sky Sep 26, 2019
7d79dd3
Checkout .project
sashadev-sky Sep 26, 2019
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
1 change: 1 addition & 0 deletions assets/icons/svg-min/drag.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: 0 additions & 1 deletion assets/icons/svg-min/transform.svg

This file was deleted.

3 changes: 3 additions & 0 deletions assets/icons/svg/drag.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: 0 additions & 3 deletions assets/icons/svg/transform.svg

This file was deleted.

50 changes: 25 additions & 25 deletions assets/icons/symbol/sprite.symbol.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
.svg-crop_rotate-dims { width: 18px; height: 18px; }
.svg-delete_forever-dims { width: 18px; height: 18px; }
.svg-distort-dims { width: 18px; height: 18px; }
.svg-drag-dims { width: 18px; height: 18px; }
.svg-explore-dims { width: 18px; height: 18px; }
.svg-flip_to_back-dims { width: 18px; height: 18px; }
.svg-flip_to_front-dims { width: 18px; height: 18px; }
Expand All @@ -36,7 +37,6 @@
.svg-rotate-dims { width: 18px; height: 18px; }
.svg-scale-dims { width: 18px; height: 18px; }
.svg-spinner-dims { width: 18px; height: 18px; }
.svg-transform-dims { width: 18px; height: 18px; }
.svg-unlock-dims { width: 18px; height: 18px; }
</style>
<!--
Expand Down Expand Up @@ -65,6 +65,7 @@
<symbol viewBox="0 0 18 18" id="crop_rotate"><path d="M5.603 16.117C3.15 14.947 1.394 12.57 1.125 9.75H0C.383 14.37 4.245 18 8.963 18c.172 0 .33-.015.495-.023L6.6 15.113l-.997 1.005zM9.037 0c-.172 0-.33.015-.495.03L11.4 2.888l.998-.998a7.876 7.876 0 014.477 6.36H18C17.617 3.63 13.755 0 9.037 0zM12 10.5h1.5V6A1.5 1.5 0 0012 4.5H7.5V6H12v4.5zM6 12V3H4.5v1.5H3V6h1.5v6A1.5 1.5 0 006 13.5h6V15h1.5v-1.5H15V12H6z"/></symbol>
<symbol viewBox="0 0 18 18" id="delete_forever"><path d="M4.5 14.25c0 .825.675 1.5 1.5 1.5h6c.825 0 1.5-.675 1.5-1.5v-9h-9v9zm1.845-5.34l1.058-1.058L9 9.443l1.59-1.59 1.058 1.058-1.59 1.59 1.59 1.59-1.058 1.058L9 11.558l-1.59 1.59-1.058-1.058 1.59-1.59-1.597-1.59zM11.625 3l-.75-.75h-3.75l-.75.75H3.75v1.5h10.5V3h-2.625z"/></symbol>
<symbol viewBox="0 0 18 18" id="distort"><path d="M1.7 1.4H6v1.4h5.8V1.4h4.3v4.3h-1.4v5.8h1.4v4.4h-4.3v-1.5H6v1.5H1.7v-4.4h1.4V5.7H1.7V1.4zm10.1 4.3V4.3H6v1.4H4.6v5.8H6V13h5.8v-1.5h1.4V5.7h-1.4zM3.1 2.8v1.5h1.5V2.8H3.1zm10.1 0v1.5h1.5V2.8h-1.5zM3.1 13v1.4h1.5V13H3.1zm10.1 0v1.4h1.5V13h-1.5z"/></symbol>
<symbol viewBox="0 0 18 18" id="drag"><path d="M2.3 16.5c-.2 0-.4-.1-.5-.2-.2-.2-.3-.5-.2-.8L4.1 9 1.6 2.5c-.1-.2-.1-.5.1-.7.2-.2.5-.3.8-.2L9 4.1l6.5-2.5c.3-.1.6 0 .8.2.2.2.3.5.2.8L14 9.1l2.5 6.5c.1.3 0 .6-.2.8-.2.2-.5.3-.8.2L9 14.1l-6.5 2.5c-.1-.1-.2-.1-.2-.1zM3.6 3.6l2 5.1c.1.2.1.4 0 .5l-2 5.1 5.1-2c.2-.1.4-.1.5 0l5.1 2-1.9-5c-.1-.2-.1-.4 0-.5l2-5.1-5.1 1.9c-.2.1-.4.1-.5 0l-5.2-2z"/></symbol>
<symbol viewBox="0 0 18 18" id="explore"><path d="M9 1.5C4.86 1.5 1.5 4.86 1.5 9c0 4.14 3.36 7.5 7.5 7.5 4.14 0 7.5-3.36 7.5-7.5 0-4.14-3.36-7.5-7.5-7.5zM9 15c-3.308 0-6-2.693-6-6 0-3.308 2.692-6 6-6 3.307 0 6 2.692 6 6 0 3.307-2.693 6-6 6zm-4.125-1.875l5.633-2.617 2.617-5.633-5.633 2.617-2.617 5.633zM9 8.175c.457 0 .825.367.825.825A.823.823 0 019 9.825.823.823 0 018.175 9c0-.457.367-.825.825-.825z"/></symbol>
<symbol viewBox="0 0 18 18" id="flip_to_back"><path d="M6.75 5.25h-1.5v1.5h1.5v-1.5zm0 3h-1.5v1.5h1.5v-1.5zm0-6a1.5 1.5 0 00-1.5 1.5h1.5v-1.5zm3 9h-1.5v1.5h1.5v-1.5zm4.5-9v1.5h1.5c0-.825-.675-1.5-1.5-1.5zm-4.5 0h-1.5v1.5h1.5v-1.5zm-3 10.5v-1.5h-1.5a1.5 1.5 0 001.5 1.5zm7.5-3h1.5v-1.5h-1.5v1.5zm0-3h1.5v-1.5h-1.5v1.5zm0 6c.825 0 1.5-.675 1.5-1.5h-1.5v1.5zm-10.5-7.5h-1.5v9a1.5 1.5 0 001.5 1.5h9v-1.5h-9v-9zm7.5-1.5h1.5v-1.5h-1.5v1.5zm0 9h1.5v-1.5h-1.5v1.5z"/></symbol>
<symbol viewBox="0 0 18 18" id="flip_to_front"><path d="M2.25 9.75h1.5v-1.5h-1.5v1.5zm0 3h1.5v-1.5h-1.5v1.5zm1.5 3v-1.5h-1.5a1.5 1.5 0 001.5 1.5zm-1.5-9h1.5v-1.5h-1.5v1.5zm9 9h1.5v-1.5h-1.5v1.5zm3-13.5h-7.5a1.5 1.5 0 00-1.5 1.5v7.5a1.5 1.5 0 001.5 1.5h7.5c.825 0 1.5-.675 1.5-1.5v-7.5c0-.825-.675-1.5-1.5-1.5zm0 9h-7.5v-7.5h7.5v7.5zm-6 4.5h1.5v-1.5h-1.5v1.5zm-3 0h1.5v-1.5h-1.5v1.5z"/></symbol>
Expand All @@ -77,7 +78,6 @@
<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>
<symbol viewBox="0 0 18 18" id="spinner"><path d="M9 6.48c-.216 0-.36-.144-.36-.36V3.24c0-.216.144-.36.36-.36s.36.144.36.36v2.88c0 .216-.144.36-.36.36z"/><path d="M9 15.12c-.216 0-.36-.144-.36-.36v-2.88c0-.216.144-.36.36-.36s.36.144.36.36v2.88c0 .216-.144.36-.36.36zm1.44-8.28c-.072 0-.108 0-.18-.036-.144-.108-.216-.288-.108-.468l1.44-2.484c.108-.144.288-.216.468-.108.144.108.216.288.108.468l-1.44 2.484c-.072.072-.18.144-.288.144zm-4.32 7.488c-.072 0-.108 0-.18-.036-.144-.108-.216-.288-.108-.468l1.44-2.484c.108-.144.288-.216.468-.108.144.108.216.288.108.468l-1.44 2.484c-.072.072-.18.144-.288.144z" opacity=".3"/><path d="M7.56 6.84c-.108 0-.216-.072-.288-.18l-1.44-2.484c-.108-.144-.036-.36.108-.468.144-.108.36-.036.468.108L7.848 6.3c.108.144.036.36-.108.468-.072.072-.108.072-.18.072z" opacity=".93"/><path d="M11.88 14.328c-.108 0-.216-.072-.288-.18l-1.44-2.484c-.108-.144-.036-.36.108-.468.144-.108.36-.036.468.108l1.44 2.484c.108.144.036.36-.108.468-.072.036-.108.072-.18.072z" opacity=".3"/><path d="M6.12 9.36H3.24c-.216 0-.36-.144-.36-.36s.144-.36.36-.36h2.88c.216 0 .36.144.36.36s-.144.36-.36.36z" opacity=".65"/><path d="M14.76 9.36h-2.88c-.216 0-.36-.144-.36-.36s.144-.36.36-.36h2.88c.216 0 .36.144.36.36s-.144.36-.36.36z" opacity=".3"/><path d="M6.516 7.884c-.072 0-.108 0-.18-.036l-2.484-1.44c-.144-.108-.216-.288-.108-.468.108-.144.288-.216.468-.108l2.484 1.44c.144.108.216.288.108.468a.327.327 0 01-.288.144z" opacity=".86"/><path d="M14.004 12.204c-.072 0-.108 0-.18-.036l-2.484-1.44c-.144-.108-.216-.288-.108-.468.108-.144.288-.216.468-.108l2.484 1.44c.144.108.216.288.108.468a.327.327 0 01-.288.144z" opacity=".3"/><path d="M3.996 12.204c-.108 0-.216-.072-.288-.18-.108-.144-.036-.36.108-.468l2.484-1.44c.144-.108.36-.036.468.108.108.144.036.36-.108.468l-2.484 1.44c-.036.072-.108.072-.18.072z" opacity=".44"/><path d="M11.484 7.884c-.108 0-.216-.072-.288-.18-.108-.144-.036-.36.108-.468l2.484-1.44c.144-.108.36-.036.468.108.108.144.036.36-.108.468l-2.484 1.44c-.072.072-.108.072-.18.072z" opacity=".3"/></symbol>
<symbol viewBox="0 0 18 18" id="transform"><path d="M16.5 13.5V12H6V3h1.5L5.25.75 3 3h1.5v1.5h-3V6h3v6c0 .825.675 1.5 1.5 1.5h6V15h-1.5l2.25 2.25L15 15h-1.5v-1.5h3zM7.5 6H12v4.5h1.5V6c0-.825-.675-1.5-1.5-1.5H7.5V6z"/></symbol>
<symbol viewBox="0 0 18 18" id="unlock"><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.5h1.5A2.247 2.247 0 019 2.25a2.247 2.247 0 012.25 2.25V6H4.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.5zm0 9h-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>
</svg>

Expand Down Expand Up @@ -163,6 +163,17 @@ <h2>delete_forever</h2>
</div>
<h2>distort</h2>
</li>
<li title="drag">
<div class="icon-box">

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

</div>
<h2>drag</h2>
</li>
<li title="explore">
<div class="icon-box">

Expand Down Expand Up @@ -295,17 +306,6 @@ <h2>scale</h2>
</div>
<h2>spinner</h2>
</li>
<li title="transform">
<div class="icon-box">

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

</div>
<h2>transform</h2>
</li>
<li title="unlock">
<div class="icon-box">

Expand Down Expand Up @@ -393,6 +393,17 @@ <h2>delete_forever</h2>
</div>
<h2>distort</h2>
</li>
<li title="drag">
<div class="icon-box">

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

</div>
<h2>drag</h2>
</li>
<li title="explore">
<div class="icon-box">

Expand Down Expand Up @@ -525,17 +536,6 @@ <h2>scale</h2>
</div>
<h2>spinner</h2>
</li>
<li title="transform">
<div class="icon-box">

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

</div>
<h2>transform</h2>
</li>
<li title="unlock">
<div class="icon-box">

Expand All @@ -555,7 +555,7 @@ <h2>unlock</h2>

</section>
<footer>
<p>Generated at Fri, 16 Aug 2019 10:08:57 GMT by <a href="https://github.com/jkphl/svg-sprite" target="_blank">svg-sprite</a>.</p>
<p>Generated at Tue, 24 Sep 2019 07:10:31 GMT by <a href="https://github.com/jkphl/svg-sprite" target="_blank">svg-sprite</a>.</p>
</footer>
</body>
</html>
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.
8 changes: 7 additions & 1 deletion dist/leaflet.distortableimage.css
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,16 @@ a.leaflet-toolbar-icon.freeRotate.selected-mode {
}

a.leaflet-toolbar-icon.rotate.selected-mode .ldi-icon,
a.leaflet-toolbar-icon.freeRotate.selected-mode .ldi-icon {
a.leaflet-toolbar-icon.freeRotate.selected-mode .ldi-icon,
a.leaflet-toolbar-icon.drag.selected-mode .ldi-icon {
fill: white;
}

a.leaflet-toolbar-icon.drag.selected-mode {
background-color: rgba(9, 155, 56, 0.75);
border: inset 0.5px lightgray;
}

a.leaflet-toolbar-icon.distort.selected-mode,
a.leaflet-toolbar-icon.scale.selected-mode {
background-color: hsla(239, 97%, 55%, 0.75);
Expand Down
Loading