fix scope collision after splitting

8c3b49ae · Boris Kocherov · 08eb2298 · 8c3b49ae · 8c3b49ae
Commit 8c3b49ae authored May 02, 2018 by Boris Kocherov
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 6 deletions

gadget_json_generated_form.html gadget_json_generated_form.html +0 -3

gadget_json_generated_form.js gadget_json_generated_form.js +12 -3

No files found.
--- a/gadget_json_generated_form.html
+++ b/gadget_json_generated_form.html
@@ -14,8 +14,5 @@
    <script src="gadget_json_generated_form.js" type="text/javascript"></script>
  </head>
  <body>
-    <div data-gadget-url="gadget_json_generated_form_child.html"
-         data-gadget-scope="json_form_child"
-         data-gadget-sandbox="public"></div>
  </body>
 </html>
--- a/gadget_json_generated_form.js
+++ b/gadget_json_generated_form.js
@@ -511,9 +511,18 @@
      //   message: error_message can be array containing dom elements
      // }
      g.props.schema_resolve_errors = {};
-      return g.getDeclaredGadget("json_form_child")
-        .push(function (json_form_child) {
-          g.props.form_gadget = json_form_child;
+      return RSVP.Queue()
+        .push(function () {
+          if (!g.props.form_gadget) {
+            return g.declareGadget('gadget_json_generated_form_child.html',
+              {scope: "j" + Math.random().toString(36).substr(2, 9)})
+              .push(function (json_form_child) {
+                g.props.form_gadget = json_form_child;
+                g.element.appendChild(json_form_child.element);
+              });
+          }
+        })
+        .push(function () {
          if (options.schema) {
            return options.schema;
          }