Skip to content
Browse files

Merge pull request #59 from PangbornIdentity/master

Temporary fix for issue 57
  • Loading branch information...
2 parents 8e13544 + f974a42 commit e64fca743bf90e35a1abf724ed25f078cd828e1b @McPants committed
Showing with 13 additions and 4 deletions.
  1. +9 −3 core/jquery.shapeshift.js
  2. +4 −1 demos/clone.html
View
12 core/jquery.shapeshift.js
@@ -454,7 +454,9 @@
$clone.remove();
$("." + current_container_class).trigger("ss-rearrange");
} else {
- $clone.removeClass(clone_class);
+ $clone.removeClass(clone_class);
+ $original_container.shapeshift($original_container.data("plugin_shapeshift").options);
+ $current_container.shapeshift($current_container.data("plugin_shapeshift").options);
}
}
if ($original_container[0] === $current_container[0]) {
@@ -554,8 +556,12 @@
}
this.arrange(true);
if ($start_container[0] !== $selected.parent()[0]) {
- previous_container_class = options.previousContainerClass;
- return $("." + previous_container_class).trigger("ss-rearrange");
+ previous_container_class = options.previousContainerClass;
+ if ($("." + previous_container_class).data("plugin_shapeshift").options.enableCrossDrop == true) {
+ return $("." + previous_container_class).trigger("ss-rearrange");
+ } else {
+ return $("." + previous_container_class);
+ }
}
} else {
placeholder_class = this.options.placeholderClass;
View
5 demos/clone.html
@@ -39,7 +39,8 @@
<script>
$(document).ready(function() {
$(".clones").shapeshift({
- dragClone: true
+ dragClone: true,
+ enableCrossDrop: false
});
$(".droparea").shapeshift({
colWidth: 100
@@ -58,5 +59,7 @@
<div class="container droparea">
</div>
+ <div class="container droparea">
+ </div>
</body>
</html>

0 comments on commit e64fca7

Please sign in to comment.
Something went wrong with that request. Please try again.