Commit 8e9c955a authored by Jérome Perrin's avatar Jérome Perrin

DREAM bug fix: do not erase edge properties when loading a graph !

parent bfc2af15
...@@ -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>ts17691107.44</string> </value> <value> <string>ts17759117.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>25441</int> </value> <value> <int>25443</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment