Commit 51b67649 authored by Sven Franck's avatar Sven Franck

app: fixed wrong elements generated because not resetting type in loop

parent e7f6c49d
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
// add missing logic // add missing logic
spec.logic = spec.logic || {}; spec.logic = spec.logic || {};
spec.attributes = spec.attributes || {};
// enhanced! // enhanced!
spec.attributes["data-enhanced"] = true; spec.attributes["data-enhanced"] = true;
...@@ -3716,6 +3717,7 @@ ...@@ -3716,6 +3717,7 @@
for (j = 0; j < item.scheme.length; j += 1) { for (j = 0; j < item.scheme.length; j += 1) {
segment = item.scheme[j]; segment = item.scheme[j];
field_list = []; field_list = [];
type = null;
// loop scheme field_list // loop scheme field_list
for (k = 0; k < segment.field_list.length; k += 1) { for (k = 0; k < segment.field_list.length; k += 1) {
...@@ -3949,7 +3951,7 @@ ...@@ -3949,7 +3951,7 @@
loaded_options = answer.response; loaded_options = answer.response;
// need to handle multi radio/checkbox groups... // need to handle multi radio/checkbox groups... and selects????
if (loaded_options) { if (loaded_options) {
push = answer.pass.push; push = answer.pass.push;
...@@ -4038,6 +4040,7 @@ ...@@ -4038,6 +4040,7 @@
for (m = 0; m < section_response_list.length; m += 1) { for (m = 0; m < section_response_list.length; m += 1) {
helper.children.push(section_response_list[m]); helper.children.push(section_response_list[m]);
} }
return RSVP.resolve(helper); return RSVP.resolve(helper);
}) })
.fail(app.util.error); .fail(app.util.error);
...@@ -6344,6 +6347,14 @@ ...@@ -6344,6 +6347,14 @@
data_total_rows = pointer_results.data.total_rows; data_total_rows = pointer_results.data.total_rows;
} }
// kids (must be declared before wrapper, because some wrapper need length
if (pass.content_dict.view_dict) {
kids = pass.content_dict.view_dict[pass.url_dict.mode] ||
pass.content_dict.view_dict["default"];
} else {
kids = pass.content_dict.children || pass.config_dict.children || [];
}
// set generator // set generator
if (pass.skip) { if (pass.skip) {
if (!pass.content_dict.generate) { if (!pass.content_dict.generate) {
...@@ -6380,14 +6391,6 @@ ...@@ -6380,14 +6391,6 @@
} }
} }
// kids (must be declared before wrapper, because some wrapper need length
if (pass.content_dict.view_dict) {
kids = pass.content_dict.view_dict[pass.url_dict.mode] ||
pass.content_dict.view_dict["default"];
} else {
kids = pass.content_dict.children || pass.config_dict.children || [];
}
// wrapper object and properties // wrapper object and properties
quirk_dict = util.mergeObject( quirk_dict = util.mergeObject(
(pass[method ? "content_dict" : "config_dict"].property_dict), (pass[method ? "content_dict" : "config_dict"].property_dict),
......
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