Skip to content

erp5
erp5
Commit 71636846 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

[erp5_web_renderjs_ui] Rewrite password field

parent e7ffd96f
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 84 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_passwordfield_html.html
View file @ 71636846
...@@ -10,11 +10,8 @@ ...@@ -10,11 +10,8 @@
<script src="renderjs.js" type="text/javascript"></script> <script src="renderjs.js" type="text/javascript"></script>
<!-- custom script --> <!-- custom script -->
<script src="gadget_erp5_field_password.js" type="text/javascript"></script> <script src="gadget_erp5_field_password.js" type="text/javascript"></script>
<script src="gadget_global.js" type="text/javascript"></script>
</head> </head>
<body> <body>
<input type='password' />
</body> </body>
</html> </html>
\ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_passwordfield_html.xml
View file @ 71636846
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>948.15927.5523.50432</string> </value> <value> <string>954.34618.13218.7202</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1451916955.39</float> <float>1476692387.49</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_passwordfield_js.js
View file @ 71636846
/*global window, rJS, RSVP, loopEventListener */ /*global window, rJS */
/*jslint indent: 2, maxerr: 3 */ /*jslint indent: 2, maxerr: 3 */
(function (window, rJS, RSVP, loopEventListener) { (function (window, rJS) {
"use strict"; "use strict";
rJS(window) rJS(window)
.ready(function (gadget) { .setState({
return gadget.getElement() tag: 'p'
.push(function (element) {
gadget.element = element;
});
}) })
.declareAcquiredMethod("notifyValid", "notifyValid")
.declareAcquiredMethod("notifyInvalid", "notifyInvalid")
.declareAcquiredMethod("notifyChange", "notifyChange")
.declareMethod('render', function (options) { .declareMethod('render', function (options) {
var input = this.element.querySelector('input'), var field_json = options.field_json || {},
field_json = options.field_json || {}; state_dict = {
input.setAttribute( value: field_json.value || field_json.default || "",
'value', editable: field_json.editable,
field_json.value || field_json.default || "" required: field_json.required,
); name: field_json.key,
input.setAttribute('name', field_json.key); title: field_json.title,
input.setAttribute('title', field_json.title); type: 'password'
if (field_json.required === 1) { };
input.setAttribute('required', 'required'); state_dict.text_content = state_dict.value;
} return this.changeState(state_dict);
if (field_json.editable !== 1) { })
input.setAttribute('readonly', 'readonly');
input.setAttribute('data-wrapper-class', 'ui-state-readonly');
// input.setAttribute('disabled', 'disabled');
.onStateChange(function (modification_dict) {
var element = this.element,
gadget = this,
url,
result;
if (modification_dict.hasOwnProperty('editable')) {
if (gadget.state.editable) {
url = 'gadget_html5_input.html';
} else {
url = 'gadget_html5_element.html';
}
result = this.declareGadget(url, {scope: 'sub'})
.push(function (input) {
// Clear first to DOM, append after to reduce flickering/manip
while (element.firstChild) {
element.removeChild(element.firstChild);
} }
element.appendChild(input.element);
return input;
});
} else {
result = this.getDeclaredGadget('sub');
}
return result
.push(function (input) {
var state;
if (gadget.state.editable) {
state = gadget.state;
} else {
state = {
tag: gadget.state.tag,
text_content: '*****'
};
}
return input.render(state);
});
}) })
.declareMethod('getContent', function () { .declareMethod('getContent', function () {
var input = this.element.querySelector('input'), if (this.state.editable) {
result = {}; return this.getDeclaredGadget('sub')
result[input.getAttribute('name')] = input.value; .push(function (gadget) {
return result; return gadget.getContent();
})
.declareMethod('checkValidity', function () {
var result;
result = this.element.querySelector('input').checkValidity();
if (result) {
return this.notifyValid()
.push(function () {
return result;
}); });
} }
return result; return {};
}) })
.declareService(function () { .declareMethod('getTextContent', function () {
//////////////////////////////////// return this.getDeclaredGadget('sub')
// Check field validity when the value changes .push(function (gadget) {
//////////////////////////////////// return gadget.getTextContent();
var field_gadget = this; });
function notifyChange() {
return RSVP.all([
field_gadget.checkValidity(),
field_gadget.notifyChange()
]);
}
// Listen to input change
return loopEventListener(
field_gadget.element.querySelector('input'),
'change',
false,
notifyChange
);
}) })
.declareService(function () { .declareMethod('checkValidity', function () {
//////////////////////////////////// if (this.state.editable) {
// Inform when the field input is invalid return this.getDeclaredGadget('sub')
//////////////////////////////////// .push(function (gadget) {
var field_gadget = this; return gadget.checkValidity();
});
function notifyInvalid(evt) {
return field_gadget.notifyInvalid(evt.target.validationMessage);
} }
return true;
// Listen to input change
return loopEventListener(
field_gadget.element.querySelector('input'),
'invalid',
false,
notifyInvalid
);
}); });
}(window, rJS, RSVP, loopEventListener)); }(window, rJS));
\ No newline at end of file \ No newline at end of file
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_passwordfield_js.xml
View file @ 71636846
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>948.15926.4347.12851</string> </value> <value> <string>954.42836.22978.32768</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1451916854.13</float> <float>1476692631.72</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7