lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-04-05 20:48:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

custom builds that do not include drag and drop now work correctly fixes #465

Browse Source
This commit is contained in:
Eric Rowell 2013-05-31 23:36:43 -07:00
parent 244273eb4c
commit 7b9322c15c
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Node.js
View File

@ -1139,6 +1139,9 @@
}, },
shouldDrawHit: function() { shouldDrawHit: function() {
return this.isVisible() && this.isListening() && !Kinetic.Global.isDragging(); return this.isVisible() && this.isListening() && !Kinetic.Global.isDragging();
},
isDraggable: function() {
return false;
} }
}); });

8
tests/html/special/coreCustomBuild.html
View File

@ -8,17 +8,15 @@
<body> <body>
<div id="container"></div> <div id="container"></div>
<script src="../../../dist/kinetic-Global-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Global-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Type-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Util-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Canvas-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Canvas-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Transform-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Collection-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Node-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Node-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Container-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Container-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Shape-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Stage-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Stage-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Layer-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Layer-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Group-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Group-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Shape-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Circle-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Circle-vcurrent.min.js"></script>
<script src="../../js/Test.js"></script> <script src="../../js/Test.js"></script>

12
tests/html/special/dragAndDropCustomBuild.html
View File

@ -8,22 +8,16 @@
<body> <body>
<div id="container"></div> <div id="container"></div>
<script src="../../../dist/kinetic-Global-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Global-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Type-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Util-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Canvas-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Canvas-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Transform-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Collection-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Animation-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Node-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Node-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Animation-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-DragAndDrop-vcurrent.min.js"></script> <script src="../../../dist/kinetic-DragAndDrop-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Container-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Container-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Shape-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Stage-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Stage-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Layer-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Layer-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Group-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Group-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Shape-vcurrent.min.js"></script>
<script src="../../../dist/kinetic-Circle-vcurrent.min.js"></script> <script src="../../../dist/kinetic-Circle-vcurrent.min.js"></script>