Commit 7a2c7c2c authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Xiaowu Zhang

erp5_officejs: Fix Panel close

parent 226cedcb
......@@ -29,6 +29,7 @@
.push(function (element) {
g.props.element = element;
g.props.jelement = $(element.querySelector("div"));
g.props.render_deferred = RSVP.defer();
});
})
......@@ -83,41 +84,49 @@
value = element_list[i].textContent;
push(key, value);
}
return queue;
return queue
.push(function () {
return gadget.props.render_deferred.resolve();
});
})
/////////////////////////////////////////////////////////////////
// declared services
/////////////////////////////////////////////////////////////////
.declareService(function () {
var panel_gadget,
form_list,
event_list,
i,
len;
function formSubmit() {
panel_gadget.toggle();
}
panel_gadget = this;
form_list = panel_gadget.props.element.querySelectorAll('form');
event_list = [];
// XXX: not robust - Will break when search field is active
for (i = 0, len = form_list.length; i < len; i += 1) {
event_list[i] = loopEventListener(
form_list[i],
'submit',
false,
formSubmit
);
}
var panel_gadget = this;
return new RSVP.Queue()
.push(function () {
return RSVP.all(event_list);
return panel_gadget.props.render_deferred.promise;
})
.push(function () {
var form_list,
event_list,
i,
len;
function formSubmit() {
panel_gadget.toggle();
}
form_list = panel_gadget.props.element.querySelectorAll('form');
event_list = [];
// XXX: not robust - Will break when search field is active
for (i = 0, len = form_list.length; i < len; i += 1) {
event_list[i] = loopEventListener(
form_list[i],
'submit',
false,
formSubmit
);
}
return new RSVP.Queue()
.push(function () {
return RSVP.all(event_list);
});
});
});
......
......@@ -68,6 +68,7 @@
<value>
<tuple>
<string>contributor/person_module/1</string>
<string>contributor/person_module/2</string>
</tuple>
</value>
</item>
......@@ -251,7 +252,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
<value> <string>supercedriclen</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -265,7 +266,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>954.32960.61602.49578</string> </value>
<value> <string>956.47493.18553.34594</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -283,7 +284,7 @@
</tuple>
<state>
<tuple>
<float>1476099905.42</float>
<float>1484749934.29</float>
<string>UTC</string>
</tuple>
</state>
......
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