- Drag&Drop a connection where source or target system is an Abyss system, should switch connection type to "abyss"

- fixed js bug in "route finder" module
- fixed UI z-Index glitch where systems "overlap" context menu
This commit is contained in:
Mark Friedrich
2018-06-04 21:37:40 +02:00
parent d59fe133e2
commit e30f8a754c
9 changed files with 62 additions and 27 deletions

View File

@@ -1831,7 +1831,6 @@ define([
dataType: 'json',
context: connections
}).done(function(data){
// remove connections from map
removeConnections(this);
@@ -1839,7 +1838,6 @@ define([
if(callback){
callback();
}
}).fail(function( jqXHR, status, error) {
let reason = status + ' ' + error;
Util.showNotify({title: jqXHR.status + ': deleteSystem', text: reason, type: 'warning'});
@@ -2509,6 +2507,11 @@ define([
return false;
}
// switch connection type to "abyss" in case source OR target system belongs to "a-space"
if(sourceSystem.data('typeId') === 3 || targetSystem.data('typeId') === 3){
setConnectionScope(connection, 'abyssal');
}
// set "default" connection status only for NEW connections
if(!connection.suspendedElement){
MapUtil.setConnectionWHStatus(connection, MapUtil.getDefaultConnectionTypeByScope(connection.scope) );

View File

@@ -92,10 +92,15 @@ define([
* get a unique cache key name for "source"/"target"-name
* @param sourceName
* @param targetName
* @returns {string}
* @returns {*}
*/
let getConnectionDataCacheKey = (sourceName, targetName) => {
return [sourceName.toLowerCase(), targetName.toLowerCase()].sort().join('###');
let key = false;
if(sourceName && targetName){
// names can be "undefined" in case system is currently on drag/drop
key = [sourceName.toLowerCase(), targetName.toLowerCase()].sort().join('###');
}
return key;
};
/**