summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-11-29 00:43:39 (EST)
committerStephan Born2012-11-29 00:43:39 (EST)
commit2a17a9ae5d8d3084ee5c64ce66b19e0754fd1f83 (patch)
tree7ca8ec5c996716f84f6b9c2e091a37500435c97c
parentc8115a6390b97abfde026cb08a90f409ca393d5f (diff)
downloadorg.eclipse.stardust.ui.web-2a17a9ae5d8d3084ee5c64ce66b19e0754fd1f83.zip
org.eclipse.stardust.ui.web-2a17a9ae5d8d3084ee5c64ce66b19e0754fd1f83.tar.gz
org.eclipse.stardust.ui.web-2a17a9ae5d8d3084ee5c64ce66b19e0754fd1f83.tar.bz2
CRNT-26699
Added manual_Activity icon to ActivitySymbol flyout menu in m_activitySymbol.js Added check if currentActivity type is same as required, so server call required in switchToApplicationActivity amd switchToSubprocessActivity . git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@61220 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_activitySymbol.js62
1 files changed, 48 insertions, 14 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_activitySymbol.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_activitySymbol.js
index 4bb7f8d..e7cc351 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_activitySymbol.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_activitySymbol.js
@@ -125,7 +125,6 @@ define(
*/
ActivitySymbol.prototype.initializeFromJson = function(lane) {
m_activity.typeObject(this.modelElement);
-
this.parentSymbol = lane;
this.parentSymbolId = lane.id;
this.parentSymbol.containedSymbols.push(this);
@@ -484,7 +483,13 @@ define(
imageWidth : 16,
imageHeight : 16,
clickHandler : ActivitySymbol_switchToApplicationActivityClosure
- } ]);
+ },
+ {
+ imageUrl : "../../images/icons/activity-manual.png",
+ imageWidth : 16,
+ imageHeight : 16,
+ clickHandler : ActivitySymbol_switchToManualActivityClosure
+ }]);
};
/**
@@ -509,30 +514,51 @@ define(
*
*/
ActivitySymbol.prototype.switchToSubprocessActivity = function() {
- this.icon.hide();
+ if (this.modelElement.activityType != m_constants.SUBPROCESS_ACTIVITY_TYPE) {
+ this.icon.hide();
- this.modelElement.activityType = m_constants.SUBPROCESS_ACTIVITY_TYPE;
- this.icon = this.subprocessIcon;
+ this.modelElement.activityType = m_constants.SUBPROCESS_ACTIVITY_TYPE;
+ this.icon = this.subprocessIcon;
- this.icon.show();
- this.icon.toFront();
+ this.icon.show();
+ this.icon.toFront();
- this.submitChanges();
+ this.submitChanges();
+ }
};
/**
*
*/
ActivitySymbol.prototype.switchToApplicationActivity = function() {
- this.icon.hide();
+ if (this.modelElement.activityType != m_constants.APPLICATION_ACTIVITY_TYPE) {
+ this.icon.hide();
+
+ this.modelElement.activityType = m_constants.APPLICATION_ACTIVITY_TYPE;
+ this.icon = this.applicationIcon;
- this.modelElement.activityType = m_constants.APPLICATION_ACTIVITY_TYPE;
- this.icon = this.applicationIcon;
+ this.icon.show();
+ this.icon.toFront();
- this.icon.show();
- this.icon.toFront();
+ this.submitChanges();
+ }
+ };
- this.submitChanges();
+ /**
+ *
+ */
+ ActivitySymbol.prototype.switchToManualActivity = function() {
+ if (this.modelElement.activityType != m_constants.MANUAL_ACTIVITY_TYPE) {
+ this.icon.hide();
+
+ this.modelElement.activityType = m_constants.MANUAL_ACTIVITY_TYPE;
+ this.icon = this.manualActivityIcon;
+
+ this.icon.show();
+ this.icon.toFront();
+
+ this.submitChanges();
+ }
};
/**
@@ -713,6 +739,14 @@ define(
/**
*
*/
+ function ActivitySymbol_switchToManualActivityClosure() {
+ this.auxiliaryProperties.callbackScope
+ .switchToManualActivity();
+ }
+
+ /**
+ *
+ */
function ActivitySymbol_subprocessMarkerIconMouseMoveClosure() {
this.auxiliaryProperties.callbackScope
.onSubprocessMarkerIconMouseMove();