tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

RuleChain UI: Coordinates protection.

pull/832/head
Igor Kulikov 8 years ago
parent
e3038f894e
commit
6c2a7d6fff
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      ui/src/app/rulechain/rulechain.controller.js

16
ui/src/app/rulechain/rulechain.controller.js
View File

@ -979,8 +979,8 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
additionalInfo: ruleNode.additionalInfo, additionalInfo: ruleNode.additionalInfo,
configuration: ruleNode.configuration, configuration: ruleNode.configuration,
debugMode: ruleNode.debugMode, debugMode: ruleNode.debugMode,
x: ruleNode.additionalInfo.layoutX, x: Math.round(ruleNode.additionalInfo.layoutX),
y: ruleNode.additionalInfo.layoutY, y: Math.round(ruleNode.additionalInfo.layoutY),
component: component, component: component,
name: ruleNode.name, name: ruleNode.name,
nodeClass: vm.types.ruleNodeType[component.type].nodeClass, nodeClass: vm.types.ruleNodeType[component.type].nodeClass,
@ -1054,8 +1054,8 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
ruleChainNode = { ruleChainNode = {
id: 'rule-chain-node-' + vm.nextNodeID++, id: 'rule-chain-node-' + vm.nextNodeID++,
additionalInfo: ruleChainConnection.additionalInfo, additionalInfo: ruleChainConnection.additionalInfo,
x: ruleChainConnection.additionalInfo.layoutX, x: Math.round(ruleChainConnection.additionalInfo.layoutX),
y: ruleChainConnection.additionalInfo.layoutY, y: Math.round(ruleChainConnection.additionalInfo.layoutY),
component: types.ruleChainNodeComponent, component: types.ruleChainNodeComponent,
nodeClass: vm.types.ruleNodeType.RULE_CHAIN.nodeClass, nodeClass: vm.types.ruleNodeType.RULE_CHAIN.nodeClass,
icon: vm.types.ruleNodeType.RULE_CHAIN.icon, icon: vm.types.ruleNodeType.RULE_CHAIN.icon,
@ -1177,8 +1177,8 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
if (!ruleNode.additionalInfo) { if (!ruleNode.additionalInfo) {
ruleNode.additionalInfo = {}; ruleNode.additionalInfo = {};
} }
ruleNode.additionalInfo.layoutX = node.x; ruleNode.additionalInfo.layoutX = Math.round(node.x);
ruleNode.additionalInfo.layoutY = node.y; ruleNode.additionalInfo.layoutY = Math.round(node.y);
ruleChainMetaData.nodes.push(ruleNode); ruleChainMetaData.nodes.push(ruleNode);
nodes.push(node); nodes.push(node);
} }
@ -1205,8 +1205,8 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
if (!ruleChainConnection.additionalInfo) { if (!ruleChainConnection.additionalInfo) {
ruleChainConnection.additionalInfo = {}; ruleChainConnection.additionalInfo = {};
} }
ruleChainConnection.additionalInfo.layoutX = destNode.x; ruleChainConnection.additionalInfo.layoutX = Math.round(destNode.x);
ruleChainConnection.additionalInfo.layoutY = destNode.y; ruleChainConnection.additionalInfo.layoutY = Math.round(destNode.y);
ruleChainConnection.additionalInfo.ruleChainNodeId = destNode.id; ruleChainConnection.additionalInfo.ruleChainNodeId = destNode.id;
ruleChainMetaData.ruleChainConnections.push(ruleChainConnection); ruleChainMetaData.ruleChainConnections.push(ruleChainConnection);
} else { } else {

Write Preview
Loading…
Cancel
Save