graph_editor: make it a iframe gadget

This is compatible with both ERP5JS and erp5_xhml_style

graph_editor: make it a iframe gadget
This is compatible with both ERP5JS and erp5_xhml_style
d181977c · Jérome Perrin · 807701f2 · d181977c · d181977c · d181977c
Commit d181977c authored Sep 20, 2018 by Jérome Perrin
4 changed files
--- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_jsplumb_graph.xml
+++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/BusinessProcess_viewGraphEditor/my_jsplumb_graph.xml
@@ -225,7 +225,13 @@
                </item>
                <item>
                    <key> <string>js_sandbox</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>iframe</string> </value>
+                </item>
+                <item>
+                    <key> <string>renderjs_extra</string> </key>
+                    <value>
+                      <list/>
+                    </value>
                </item>
                <item>
                    <key> <string>required</string> </key>
@@ -235,6 +241,14 @@
                    <key> <string>title</string> </key>
                    <value> <string>Graph</string> </value>
                </item>
+                <item>
+                    <key> <string>validator_field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>validator_form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
              </dictionary>
            </value>
        </item>

--- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/dream_graph_editor/jsplumb/index.html.html
+++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/dream_graph_editor/jsplumb/index.html.html
@@ -5,23 +5,17 @@
    <link rel="stylesheet" href="../lib/jquery-ui.css">
    <link rel="stylesheet" href="jsplumb.css">
    <title>JSPlumb gadget</title>
-<!--
- FIXME: renderjs fails if we include renderjs.js twice (this one has a different URL from ERP5's one)
-    <script src="renderjs.js" type="text/javascript"></script>
-    <script src="rsvp.js" type="text/javascript"></script>
-->
-<!--
-  FIXME: Including jQuery twice cause the jsplumb to be loaded twice.
-  For now we assume that it has already been loaded at this point.
-    <script src="../lib/jquery.js"  type="text/javascript"></script>
-->
+
+    <script src="../../rsvp.js" type="text/javascript"></script>
+    <script src="../../renderjs.js" type="text/javascript"></script>
+
+    <script src="../lib/jquery.js" type="text/javascript"></script>
    <script src="../lib/jquery-ui.js"  type="text/javascript"></script>
    <script src="../lib/jquery.jsplumb.js" type="text/javascript"></script>
    <script src="../lib/handlebars.min.js" type="text/javascript"></script>
    <script src="../lib/springy.js" type="text/javascript"></script>

    <script src="../dream/mixin_promise.js" type="text/javascript"></script>
-    <script src="jsplumb.js" type="text/javascript"></script>

    <script id="node-template" type="text/x-handlebars-template">
      <div class="window {{class}}"
@@ -47,6 +41,8 @@
        </form>
      </div>
    </script>
+
+    <script src="jsplumb.js" type="text/javascript"></script>
  </head>
  <body>
    <div class="graph_container"></div>

--- a/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/dream_graph_editor/jsplumb/jsplumb.js.js
+++ b/bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/dream_graph_editor/jsplumb/jsplumb.js.js
@@ -31,9 +31,9 @@
    */
    var gadget_klass = rJS(window);
    var domParser = new DOMParser();
-    var node_template_source = gadget_klass.__template_element.getElementById("node-template").innerHTML;
+    var node_template_source = document.getElementById("node-template").innerHTML;
    var node_template = Handlebars.compile(node_template_source);
-    var popup_edit_template = gadget_klass.__template_element.getElementById("popup-edit-template").innerHTML;
+    var popup_edit_template = document.getElementById("popup-edit-template").innerHTML;

    function layoutGraph(graph_data) {
        // Promise returning the graph once springy calculated the layout.

--- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_jsplumb_graph.xml
+++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_viewTrackingList/my_jsplumb_graph.xml
@@ -231,7 +231,13 @@
                </item>
                <item>
                    <key> <string>js_sandbox</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>iframe</string> </value>
+                </item>
+                <item>
+                    <key> <string>renderjs_extra</string> </key>
+                    <value>
+                      <list/>
+                    </value>
                </item>
                <item>
                    <key> <string>required</string> </key>
@@ -241,6 +247,14 @@
                    <key> <string>title</string> </key>
                    <value> <string>Graph</string> </value>
                </item>
+                <item>
+                    <key> <string>validator_field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>validator_form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
              </dictionary>
            </value>
        </item>