summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-09-18 03:05:04 (EDT)
committer Stephan Born2012-09-18 03:05:04 (EDT)
commitbe55ece1de6071de5991e2f8be0da014d6f1d3e6 (patch)
tree857f496f436a63fd72be5ca08427b5d9852dff84
parent4834cb0caf229ac7d35fbe016d549aed19e238a2 (diff)
downloadorg.eclipse.stardust.ui.web-be55ece1de6071de5991e2f8be0da014d6f1d3e6.zip
org.eclipse.stardust.ui.web-be55ece1de6071de5991e2f8be0da014d6f1d3e6.tar.gz
org.eclipse.stardust.ui.web-be55ece1de6071de5991e2f8be0da014d6f1d3e6.tar.bz2
CRNT-26085
1)Added check in initializeDefaultEventHandling() for PoolSymbol for Drag and Drop in m_symbol.js 2)Added check in m_diagram.js to prevent scroll on PoolSymbol git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@59289 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_diagram.js6
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_poolSymbol.js3
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_symbol.js10
3 files changed, 13 insertions, 6 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 704d3f9..9b83284 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
@@ -472,7 +472,11 @@ define(
m_dataFlowPropertiesPanel.initialize(this);
m_autoScrollManager.initScrollManager("scrollpane", function() {
var inAutoScrollMode = false;
- if (true == currentDiagram.isInConnectionMode()
+ if (null != currentDiagram.newSymbol
+ && currentDiagram.newSymbol.type == m_constants.POOL_SYMBOL) {
+ // For Default Pool drag and drop is not allowed.
+ inAutoScrollMode = false;
+ }else if (true == currentDiagram.isInConnectionMode()
|| currentDiagram.mode == currentDiagram.RUBBERBAND_MODE
|| null != currentDiagram.newSymbol
|| true == currentDiagram.isDragAndDropMode()) {
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_poolSymbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_poolSymbol.js
index 25a0100..d51b0f0 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_poolSymbol.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_poolSymbol.js
@@ -42,7 +42,6 @@ define(
m_utils.inheritFields(this, symbol);
m_utils.inheritMethods(PoolSymbol.prototype, symbol);
- this.type = m_constants.POOL_SYMBOL;
this.laneSymbols = [];
this.x = 0;
this.y = 0;
@@ -57,6 +56,7 @@ define(
* objects, diagram, base classes).
*/
PoolSymbol.prototype.bind = function(diagram) {
+ this.type = m_constants.POOL_SYMBOL;
this.diagram = diagram;
this.orientation = diagram.flowOrientation;
this.borderRectangle = null;
@@ -542,6 +542,7 @@ define(
PoolSymbol.prototype.initializeEventHandling = function() {
// this.borderRectangle.auxiliaryProperties.callbackScope =
// this;
+
};
/**
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 7cb4674..5777b44 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
@@ -1048,10 +1048,12 @@ define(
.mousemove(Symbol_mouseMoveClosure);
this.primitives[element].hover(Symbol_hoverInClosure,
Symbol_hoverOutClosure);
- this.primitives[element]
- .drag(Symbol_dragClosure,
- Symbol_dragStartClosure,
- Symbol_dragStopClosure);
+ // Drag and Drop not allowed for Pools
+ if (this.type != m_constants.POOL_SYMBOL) {
+ this.primitives[element].drag(Symbol_dragClosure,
+ Symbol_dragStartClosure,
+ Symbol_dragStopClosure);
+ }
}
};