Skip to content

dream
dream
Commit 6f4587bd authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Jérome Perrin
Browse files
Options

handling selection change. eventListener enabled. getContect to be fixed

parent b4316761
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 139 deletions
dream/platform/src/expandable_field/expandablefield.js
View file @ 6f4587bd
/*global rJS, RSVP, jQuery, Handlebars, loopEventListener, /*global rJS, RSVP, jQuery, Handlebars, loopEventListener,
promiseEventListener, initGadgetMixin, console */ promiseEventListener, initGadgetMixin, console */
/*jslint nomen: true */ /*jslint nomen: true */
(function (window, rJS, RSVP, Handlebars, initGadgetMixin) { (function (window, rJS, RSVP, Handlebars, initGadgetMixin,
// loopEventListener) { loopEventListener) {
"use strict"; "use strict";
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
...@@ -23,72 +23,16 @@ ...@@ -23,72 +23,16 @@
.innerHTML, .innerHTML,
selected_option_template = Handlebars.compile(selected_option_source); selected_option_template = Handlebars.compile(selected_option_source);
/*function addField(gadget, property_id, property_definition, value) {
console.log("ADDFIELD EXPANDABLEFIELDSET 1");
console.log(gadget);
var sub_gadget,
queue = new RSVP.Queue();
queue
.push(function () {
// XXX this is incorrect for recursive fieldsets.
// we should use nested fieldset with legend
console.log("EXPANDABLE insertingAdjacentHTML for:"
+ property_id);
console.log(1111111111111);
gadget.props.element.insertAdjacentHTML(
'beforeend',
label_template({
"for": property_id,
"name": (property_definition.name || property_id)
})
);
console.log("ADDFIELD EXPANDABLEFIELDSET 2");
if (property_definition.type === "object") {
// Create a recursive fieldset for this key.
console.log(1);
return gadget.declareGadget("../fieldset/index.html");
}
if (property_definition.type === "number") {
console.log(2);
return gadget.declareGadget("../number_field/index.html");
}
if (property_definition.enum) {
console.log(3);
return gadget.declareGadget("../list_field/index.html");
}
console.log(4);
return gadget.declareGadget("../string_field/index.html");
})
.push(function (gg) {
console.log("ADDFIELD EXPANDABLEFIELDSET to render subgadgets");
sub_gadget = gg;
return sub_gadget.render({
key: property_id,
value: value,
property_definition: property_definition
});
})
.push(function () {
console.log("ADDFIELD EXPANDABLEFIELDSET to get elements");
return sub_gadget.getElement();
})
.push(function (sub_element) {
console.log("ADDFIELD EXPANDABLEFIELDSET updating field_gadget_list");
gadget.props.element.appendChild(sub_element);
gadget.props.field_gadget_list.push(sub_gadget);
});
}*/
function syncField(gadget) { function syncField(gadget) {
console.log("SYNCFIELD EXPANDABLEFIELDSET 1"); console.log("SYNCFIELD EXPANDABLEFIELDSET 1");
var i, properties_dict, //type, value, ind, var i, properties_dict,
// current_options = gadget.props.options.value,
sub_title, sub_type, in_type, default_value, previous_value, sub_title, sub_type, in_type, default_value, previous_value,
labels, ins, j, labels, inps, j,
recent_occupied = [], recent_occupied = [],
prop_name = gadget.props.definition.property_def.title; prop_name = gadget.props.definition.property_def.title;
console.log("for prop_name");
console.log(prop_name); console.log(prop_name);
// set the title of the field // set the title of the field
gadget.props.element.children[1].innerHTML = prop_name; gadget.props.element.children[1].innerHTML = prop_name;
gadget.props.element.children[1].setAttribute("for", prop_name); gadget.props.element.children[1].setAttribute("for", prop_name);
...@@ -104,7 +48,7 @@ ...@@ -104,7 +48,7 @@
gadget.props.element.children[2].style.display = ''; gadget.props.element.children[2].style.display = '';
// XXX assuming that the number of labels // XXX assuming that the number of labels
// is the same as the number of inputs // is the same as the number of inputs
ins = gadget.props.element.children[2] inps = gadget.props.element.children[2]
.getElementsByTagName("input"); .getElementsByTagName("input");
labels = gadget.props.element.children[2] labels = gadget.props.element.children[2]
.getElementsByTagName("label"); .getElementsByTagName("label");
...@@ -118,19 +62,23 @@ ...@@ -118,19 +62,23 @@
if (gadget.props.options.value[prop_name]) { if (gadget.props.options.value[prop_name]) {
previous_value = gadget.props.options.value[prop_name][sub_title]; previous_value = gadget.props.options.value[prop_name][sub_title];
} }
for (j = 0; j <= ins.length-1; j += 1) { for (j = 0; j <= inps.length-1; j += 1) {
// if the element is not already occupied // if the element is not already occupied
if (!(recent_occupied.indexOf(ins[j]) > -1)) { if (!(recent_occupied.indexOf(inps[j]) > -1)) {
if (ins[j].getAttribute("type")) { if (inps[j].getAttribute("type")) {
// XXX hardcoded value for string input // XXX hardcoded value for string input
// as text is used in HTML // as text is used in HTML
if (sub_type === "string") {in_type = "text"; } if (sub_type === "string") {in_type = "text"; }
if (ins[j].getAttribute("type") === sub_type || if (inps[j].getAttribute("type") === sub_type ||
ins[j].getAttribute("type") === in_type ) { inps[j].getAttribute("type") === in_type ) {
ins[j].setAttribute("name", sub_title); inps[j].setAttribute("name", sub_title);
ins[j].setAttribute("title", sub_title); inps[j].setAttribute("title", sub_title);
// if (previous_value !== "undefined") // if the input type is text then undefined --> ""
ins[j].setAttribute( if (inps[j].getAttribute("type") === "text" &&
default_value === undefined) {
default_value = "";
}
inps[j].setAttribute(
"value", "value",
previous_value === undefined previous_value === undefined
? default_value ? default_value
...@@ -138,86 +86,76 @@ ...@@ -138,86 +86,76 @@
); );
labels[j].innerHTML = sub_title; labels[j].innerHTML = sub_title;
labels[j].setAttribute('for', sub_title); labels[j].setAttribute('for', sub_title);
recent_occupied.push(ins[j]); recent_occupied.push(inps[j]);
// present them
inps[j].parentNode.parentNode.style.display = '';
labels[j].style.display = '';
break; break;
} }
} }
} }
} }
} }
console.log("occupied"); for (j = 0; j <= inps.length-1; j += 1) {
console.log(recent_occupied); if (!(recent_occupied.indexOf(inps[j]) > -1)) {
for (j = 0; j <= ins.length-1; j += 1) { inps[j].parentNode.parentNode.style.display = 'block';
if (!(recent_occupied.indexOf(ins[j]) > -1)) { inps[j].parentNode.parentNode.style.display = 'none';
ins[j].parentNode.parentNode.style.display = 'block';
ins[j].parentNode.parentNode.style.display = 'none';
labels[j].style.display = 'block'; labels[j].style.display = 'block';
labels[j].style.display = 'none'; labels[j].style.display = 'none';
} }
} }
} else {
// hide the sub_field as there is nothing to show
gadget.props.element.children[2].style.display = 'block';
gadget.props.element.children[2].style.display = 'none';
} }
} }
/*function updateFieldSet(evt) { function handleSelectChange() { //evt) {
console.log("updateFieldSetupdateFieldSetupdateFieldSet"); console.log("UPDATING FIELDS DUE TO SELECTION CHANGE");
console.log(evt); var gadget = this, oneOf_list, i,
console.log(this); prop_name = gadget.props.definition.property_def.title,
console.log(this.props);
var gadget = this,
select = gadget.props.element.getElementsByTagName('select')[0], select = gadget.props.element.getElementsByTagName('select')[0],
update_value = select.options[select.selectedIndex].value, update_name = select.options[select.selectedIndex].value;
options = gadget.props.options, if (!(update_name === prop_name)) {
i, select_index, child, index; prop_name = update_name;
for (select_index = 0; // change gadget.props.definition
select_index <= gadget.props.element.childNodes.length-1; for (i = 0;
select_index += 1) { i <= gadget.props.options.property_definition.allOf.length - 1;
child = gadget.props.element.childNodes[select_index]; i += 1) {
if (child.className === "ui-select") { select_index += 1; break; } if (gadget.props.options.property_definition.allOf[i].oneOf) {
} oneOf_list
for (i = 0; i <= select_index; i += 1) { = gadget.props.options.property_definition.allOf[i].oneOf;
gadget.props.element.removeChild(gadget.props.element.lastChild); break;
} }
for (index = 0;
index <= options.property_definition.allOf.length - 1;
index += 1) {
if (options.property_definition.allOf[index].oneOf) {
break;
} }
} for (i = 0;
console.log(options.property_definition.allOf[index]); i <= oneOf_list.length - 1;
for (i = 0; i += 1) {
i <= options.property_definition.allOf[index].oneOf.length - 1; if (oneOf_list[i].title
i += 1) { === prop_name) {
if (options.property_definition.allOf[index].oneOf[i].title gadget.props.definition = {
=== update_value) { name : prop_name,
console.log( property_def : oneOf_list[i],
options.property_definition.allOf[index].oneOf[i].title, value : oneOf_list[i].default
options.property_definition.allOf[index].oneOf[i], };
options.property_definition.allOf[index].oneOf[i].default break;
); }
// addField(
// gadget,
// options.property_definition.allOf[index].oneOf[i].title,
// options.property_definition.allOf[index].oneOf[i],
// options.property_definition.allOf[index].oneOf[i].default
// );
break;
} }
} }
}*/ syncField(gadget);
}
/*function waitForListFieldSelection(gadget) { function waitForListFieldSelection(gadget) {
var element = gadget.props.element.getElementsByTagName('select')[0]; var element = gadget.props.element.getElementsByTagName('select')[0];
console.log("OLA Ta Mora stin pistaAaAaA"); console.log("INITIATING A LOOP EVENT LISTENER FOR OPTION CHANGE");
console.log(gadget);
console.log(element);
return loopEventListener( return loopEventListener(
element, element,
'change', 'change',
false, false,
updateFieldSet.bind(gadget) handleSelectChange.bind(gadget)
); );
}*/ }
initGadgetMixin(gadget_klass); initGadgetMixin(gadget_klass);
gadget_klass gadget_klass
...@@ -231,6 +169,7 @@ ...@@ -231,6 +169,7 @@
value, prop_name, prop_definition, string_value; value, prop_name, prop_definition, string_value;
console.log("EXPANDABLEFIELDSET RENDER 1"); console.log("EXPANDABLEFIELDSET RENDER 1");
console.log("provided options");
console.log(options); console.log(options);
gadget.props.key = options.key; // used for recursive fieldsets gadget.props.key = options.key; // used for recursive fieldsets
gadget.props.field_gadget_list = []; gadget.props.field_gadget_list = [];
...@@ -245,8 +184,7 @@ ...@@ -245,8 +184,7 @@
.push(function () { .push(function () {
// XXX this is incorrect for recursive fieldsets. // XXX this is incorrect for recursive fieldsets.
// we should use nested fieldset with legend // we should use nested fieldset with legend
console.log("EXPANDABLE insertingAdjacentHTML for:" console.log("expa insertingAdjacentHTML for:" + property_id);
+ property_id);
gadget.props.element.insertAdjacentHTML( gadget.props.element.insertAdjacentHTML(
'beforeend', 'beforeend',
label_template({ label_template({
...@@ -398,7 +336,7 @@ ...@@ -398,7 +336,7 @@
} }
len = gadget.props.options.property_definition.allOf.length; len = gadget.props.options.property_definition.allOf.length;
for (index = 0; index <= len - 1; index += 1) { for (index = 0; index <= len - 1; index += 1) {
console.log("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="); console.log(index + "th option of allOf");
console.log(gadget.props.options. console.log(gadget.props.options.
property_definition.allOf[index]); property_definition.allOf[index]);
if (gadget.props.options if (gadget.props.options
...@@ -434,7 +372,7 @@ ...@@ -434,7 +372,7 @@
}; };
} }
} }
console.log("ab_definition for " + index); console.log("abstract_definition for " + index);
console.log(ab_definition); console.log(ab_definition);
// add a field with abstract definition // add a field with abstract definition
addField( addField(
...@@ -522,10 +460,10 @@ ...@@ -522,10 +460,10 @@
select.options[select.selectedIndex].value; select.options[select.selectedIndex].value;
keys = Object.keys(results[Object.keys(results)[0]]); keys = Object.keys(results[Object.keys(results)[0]]);
console.log("modifying received results"); console.log("modifying received results");
/* results[Object.keys(results)[0]] :::::: is the result returned /* results[Object.keys(results)[0]] ====== is the result returned
keys[index] :::::: different keys of the result returned keys[index] ====== different keys of the result returned
results[Object.keys(results)[0]][keys[index]] ::::::: results[Object.keys(results)[0]][keys[index]] ======
the variable with key keys[index] */ the variable with key keys[index] */
for (index = 0; index <= keys.length - 1; index +=1) { for (index = 0; index <= keys.length - 1; index +=1) {
// if the type of the variable of the result is object // if the type of the variable of the result is object
if (typeof results[Object.keys(results)[0]][keys[index]] if (typeof results[Object.keys(results)[0]][keys[index]]
...@@ -594,8 +532,7 @@ ...@@ -594,8 +532,7 @@
syncField(gadget); syncField(gadget);
}) })
.push(function () { .push(function () {
// waitForListFieldSelection(gadget); waitForListFieldSelection(gadget);
console.log("wait for selection ended");
}); });
}); });
}(window, rJS, RSVP, Handlebars, initGadgetMixin));//, loopEventListener)); }(window, rJS, RSVP, Handlebars, initGadgetMixin, loopEventListener));
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7