summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-10-18 07:26:41 (EDT)
committer Manik Kishore2012-10-18 07:26:41 (EDT)
commit5da8d64565d636432ce79cb3a171d54de7c348e0 (patch)
tree39b7eac96e4eaebdfe64a654ff5b58e784952973
parentd83914814aa269a71b154418701417cc2600229b (diff)
downloadorg.eclipse.stardust.ui.web-5da8d64565d636432ce79cb3a171d54de7c348e0.zip
org.eclipse.stardust.ui.web-5da8d64565d636432ce79cb3a171d54de7c348e0.tar.gz
org.eclipse.stardust.ui.web-5da8d64565d636432ce79cb3a171d54de7c348e0.tar.bz2
CRNT-26224
Added code to disable dragDrop of SwimlaneSymbol git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@60153 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js3
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js3
2 files changed, 4 insertions, 2 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js
index efc0da2..94a9b7f 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js
@@ -476,7 +476,8 @@ define(
m_autoScrollManager.initScrollManager("scrollpane", function() {
var inAutoScrollMode = false;
if (null != currentDiagram.newSymbol
- && currentDiagram.newSymbol.isPoolSymbol()) {
+ && (currentDiagram.newSymbol.isPoolSymbol() ||
+ currentDiagram.newSymbol.type == m_constants.SWIMLANE_SYMBOL)) {
// For Default Pool drag and drop is not allowed.
inAutoScrollMode = false;
}else if (true == currentDiagram.isInConnectionMode()
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js
index 2a53076..15e2fc2 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js
@@ -1254,7 +1254,8 @@ define(
this.primitives[element].hover(Symbol_hoverInClosure,
Symbol_hoverOutClosure);
// Drag and Drop not allowed for Pools
- if (this.type != m_constants.POOL_SYMBOL) {
+ if (this.type != m_constants.POOL_SYMBOL
+ && this.type != m_constants.SWIMLANE_SYMBOL) {
this.primitives[element].drag(Symbol_dragClosure,
Symbol_dragStartClosure,
Symbol_dragStopClosure);