Commit 41462f79 authored by Sven Franck's avatar Sven Franck

app: fix double declaration of spec

parent 1370d711
...@@ -993,8 +993,8 @@ ...@@ -993,8 +993,8 @@
direction = spec.direction || "vertical"; direction = spec.direction || "vertical";
// NOTE: will only be used for dynamic element creation // NOTE: will only be used for dynamic element creation
generator = function (spec) { generator = function (generator_spec) {
var element = spec.item; var element = generator_spec.item;
// TODO: no! // TODO: no!
if (element.center) { if (element.center) {
element.text = element.center[0].title; element.text = element.center[0].title;
...@@ -1625,11 +1625,11 @@ ...@@ -1625,11 +1625,11 @@
controller, i, id, radio_id, len; controller, i, id, radio_id, len;
// makes carousel elements // makes carousel elements
generator = function (spec) { generator = function (generator_spec) {
var element, target, has_link, count, item; var element, target, has_link, count, item;
element = spec.item; element = generator_spec.item;
count = spec.count; count = generator_spec.count;
has_link = element.href; has_link = element.href;
item = factory.element({ item = factory.element({
"type": "li", "type": "li",
...@@ -1824,13 +1824,13 @@ ...@@ -1824,13 +1824,13 @@
var fragment, has_filter, generator; var fragment, has_filter, generator;
// generate list item // generate list item
generator = function (spec) { generator = function (generator_spec) {
var divider, static_item, theme, config, auto, last, item, target, list, var divider, static_item, theme, config, auto, last, item, target, list,
content, element, count; content, element, count;
element = spec.item; element = generator_spec.item;
config = spec.wrapper.property_dict; config = generator_spec.wrapper.property_dict;
count = spec.i; count = generator_spec.i;
divider = element.type === "divider" ? true : undefined; divider = element.type === "divider" ? true : undefined;
static_item = (element.href === undefined && !divider) ? true : undefined; static_item = (element.href === undefined && !divider) ? true : undefined;
theme = config.divider_theme || config.theme || "inherit"; theme = config.divider_theme || config.theme || "inherit";
...@@ -2058,14 +2058,14 @@ ...@@ -2058,14 +2058,14 @@
}); });
}; };
generator = function (spec) { generator = function (generator_spec) {
var quirk_dict, row, temp, cell, j, field, link, logic, faux_id, var quirk_dict, row, temp, cell, j, field, link, logic, faux_id,
attributes, property, snippet, title, k, button, group, dict, set, attributes, property, snippet, title, k, button, group, dict, set,
wrap, lookup, item_href, element; wrap, lookup, item_href, element;
element = spec.item; element = generator_spec.item;
quirk_dict = spec.wrapper.property_dict; quirk_dict = generator_spec.wrapper.property_dict;
wrap = spec.wrapper.wrap; wrap = generator_spec.wrapper.wrap;
temp = {}; temp = {};
row = factory.element({ row = factory.element({
"type": "tr", "type": "tr",
...@@ -4978,7 +4978,7 @@ ...@@ -4978,7 +4978,7 @@
* @return {object} action object * @return {object} action object
**/ **/
app.parseAction = function (e) { app.parseAction = function (e) {
var element, id, current, response; var element, id, current, response, has_form;
if (e.type === "popupbeforeposition" || e.type === "panelopen") { if (e.type === "popupbeforeposition" || e.type === "panelopen") {
return { return {
...@@ -5002,10 +5002,11 @@ ...@@ -5002,10 +5002,11 @@
"id": id, "id": id,
"gadget": document.getElementById(id) "gadget": document.getElementById(id)
}; };
has_form = response.gadget.getElementsByTagName("form");
console.log(e);
return util.mergeObject( return util.mergeObject(
{ {
"form": response.gadget.getElementsByTagName("form")[0], "form": has_form ? has_form[0] : undefined,
"state": (response.gadget || {}).state "state": (response.gadget || {}).state
}, },
response response
......
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