simplify

d82eab94 · Boris Kocherov · bede4ed3 · d82eab94
Commit d82eab94 authored Apr 24, 2018 by Boris Kocherov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

gadget_json_generated_form.js gadget_json_generated_form.js +2 -8

No files found.
--- a/gadget_json_generated_form.js
+++ b/gadget_json_generated_form.js
@@ -847,10 +847,7 @@
    input.placeholder = "name of " + title;
    div_input.appendChild(input);
-    return RSVP.Queue()
+    return expandSchema(g, schema, schema_path)
-      .push(function () {
-        return expandSchema(g, schema, schema_path);
-      })
      .push(function (schema_arr) {
        var queue = RSVP.Queue(),
          property_name;
@@ -915,10 +912,7 @@
      default_dict = {};
    }
-    return RSVP.Queue()
+    return expandProperties(g, json_field.properties, schema_path + '/properties/')
-      .push(function () {
-        return expandProperties(g, json_field.properties, schema_path + '/properties/');
-      })
      .push(function (ret) {
        var schema_arr,
          q = RSVP.Queue(),