Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
erp5
Commits
8e9c955a
Commit
8e9c955a
authored
Dec 05, 2014
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DREAM bug fix: do not erase edge properties when loading a graph !
parent
bfc2af15
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/jsplumb/jsplumb.js.xml
...tem/portal_skins/erp5_graph_editor/jsplumb/jsplumb.js.xml
+4
-5
No files found.
bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/jsplumb/jsplumb.js.xml
View file @
8e9c955a
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
_EtagSupport__etag
</string>
</key>
<key>
<string>
_EtagSupport__etag
</string>
</key>
<value>
<string>
ts17
691107.44
</string>
</value>
<value>
<string>
ts17
759117.85
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
__name__
</string>
</key>
<key>
<string>
__name__
</string>
</key>
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
/* ===========================================================================\n
/* ===========================================================================\n
* Copyright 2013 Nexedi SA and Contributors\n
* Copyright 2013 Nexedi SA and Contributors\n
*\n
*
\n
* This file is part of DREAM.\n
* This file is part of DREAM.\n
*\n
*\n
* DREAM is free software: you can redistribute it and/or modify\n
* DREAM is free software: you can redistribute it and/or modify\n
...
@@ -128,7 +128,7 @@
...
@@ -128,7 +128,7 @@
if (remove) {\n
if (remove) {\n
delete gadget.props.data.graph.edge[connection.id];\n
delete gadget.props.data.graph.edge[connection.id];\n
} else {\n
} else {\n
edge_data = edge_data || {\n
edge_data = edge_data ||
gadget.props.data.graph.edge[connection.id] ||
{\n
_class: "Dream.Edge"\n
_class: "Dream.Edge"\n
};\n
};\n
edge_data.source = getNodeId(gadget, connection.sourceId);\n
edge_data.source = getNodeId(gadget, connection.sourceId);\n
...
@@ -577,7 +577,6 @@
...
@@ -577,7 +577,6 @@
});\n
});\n
draggable(gadget);\n
draggable(gadget);\n
this.props.nodes_click_monitor =
RSVP.Monitor();\n
this.props.nodes_click_monitor =
RSVP.Monitor();\n
console.log(this.props.data);\n
if
(this.props.data)
{\n
if
(this.props.data)
{\n
//
load
the
data\n
//
load
the
data\n
$.each(this.props.data.graph.node,
function(key,
value)
{\n
$.each(this.props.data.graph.node,
function(key,
value)
{\n
...
@@ -599,7 +598,7 @@
...
@@ -599,7 +598,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
size
</string>
</key>
<key>
<string>
size
</string>
</key>
<value>
<int>
2544
1
</int>
</value>
<value>
<int>
2544
3
</int>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment