| author | Sidharth Singh | 2012-08-17 04:45:00 (EDT) |
|---|---|---|
| committer | Manik Kishore | 2012-08-17 04:45:00 (EDT) |
| commit | dc8521836c6b719b019679220916e6d8237695e0 (patch) (side-by-side diff) | |
| tree | 3569dd5418500cfe6af2cbeeb32adf8005384945 | |
| parent | 905216cc2121e29f7495945c24f3f23421c0dfd7 (diff) | |
| download | org.eclipse.stardust.ui.web-dc8521836c6b719b019679220916e6d8237695e0.zip org.eclipse.stardust.ui.web-dc8521836c6b719b019679220916e6d8237695e0.tar.gz org.eclipse.stardust.ui.web-dc8521836c6b719b019679220916e6d8237695e0.tar.bz2 | |
Jira-ID: CRNT-25692
Added check in populateInAccessPointSelectInput for empty accessPoints in m_dataFlowBasicPropertiesPage.js
Added code to removeFlyOutMenu and proximitySensors on connections delete.
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58467 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
| -rw-r--r-- | web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js | 2 | ||||
| -rw-r--r-- | web-modeler/src/main/resources/META-INF/xhtml/js/m_dataFlowBasicPropertiesPage.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js index 0b8d82d..c2a9f07 100644 --- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js +++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_connection.js @@ -1184,6 +1184,8 @@ define( Connection.prototype.remove = function() {
// TODO add symbol/diagram cleanup
this.path.remove();
+ this.removeFlyOutMenu();
+ this.removeProximitySensor();
// Remove this connection from FROM and TO Symbol's
// connection array
m_utils.removeItemFromArray(
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataFlowBasicPropertiesPage.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataFlowBasicPropertiesPage.js index f079ee9..2542bc0 100644 --- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataFlowBasicPropertiesPage.js +++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_dataFlowBasicPropertiesPage.js @@ -77,7 +77,7 @@ define( m_utils.debug("===> Activity");
m_utils.debug(dataFlow.activity);
- for ( var n in dataFlow.activity.getAccessPoints()) {
+ for ( var n in dataFlow.activity.accessPoints) {
var accessPoint = dataFlow.activity.getAccessPoints()[n];
if (accessPoint.direction == m_constants.IN_ACCESS_POINT
@@ -104,7 +104,7 @@ define( dataFlow) {
this.outAccessPointSelectInput.empty();
- for ( var n in dataFlow.activity.getAccessPoints()) {
+ for ( var n in dataFlow.activity.accessPoints) {
var accessPoint = dataFlow.activity.getAccessPoints()[n];
if (accessPoint.direction == m_constants.OUT_ACCESS_POINT
|