Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Lu Xu
erp5
Commits
c48dae88
Commit
c48dae88
authored
Dec 13, 2016
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Stringfield strips space characters
Mimic formulator behaviour to reduce jIO conflicts.
parent
4b946f64
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
8 deletions
+18
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_stringfield_js.js
...ateItem/web_page_module/rjs_gadget_erp5_stringfield_js.js
+2
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_stringfield_js.xml
...teItem/web_page_module/rjs_gadget_erp5_stringfield_js.xml
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_html5_input_js.js
...TemplateItem/web_page_module/rjs_gadget_html5_input_js.js
+12
-3
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_html5_input_js.xml
...emplateItem/web_page_module/rjs_gadget_html5_input_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_stringfield_js.js
View file @
c48dae88
...
@@ -16,7 +16,8 @@
...
@@ -16,7 +16,8 @@
required
:
field_json
.
required
,
required
:
field_json
.
required
,
name
:
field_json
.
key
,
name
:
field_json
.
key
,
title
:
field_json
.
title
,
title
:
field_json
.
title
,
hidden
:
field_json
.
hidden
hidden
:
field_json
.
hidden
,
trim
:
true
};
};
state_dict
.
text_content
=
state_dict
.
value
;
state_dict
.
text_content
=
state_dict
.
value
;
return
this
.
changeState
(
state_dict
);
return
this
.
changeState
(
state_dict
);
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_stringfield_js.xml
View file @
c48dae88
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
955.
22003.16805.300
3
</string>
</value>
<value>
<string>
955.
51162.4768.3512
3
</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>
14
79375148.3
2
</float>
<float>
14
81623167.4
2
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_html5_input_js.js
View file @
c48dae88
...
@@ -10,7 +10,8 @@
...
@@ -10,7 +10,8 @@
checked
:
undefined
,
checked
:
undefined
,
title
:
''
,
title
:
''
,
type
:
'
text
'
,
type
:
'
text
'
,
required
:
false
required
:
false
,
trim
:
false
})
})
.
declareMethod
(
'
render
'
,
function
(
options
)
{
.
declareMethod
(
'
render
'
,
function
(
options
)
{
...
@@ -24,7 +25,8 @@
...
@@ -24,7 +25,8 @@
title
:
options
.
title
,
title
:
options
.
title
,
focus
:
options
.
focus
,
focus
:
options
.
focus
,
step
:
options
.
step
,
step
:
options
.
step
,
hidden
:
options
.
hidden
hidden
:
options
.
hidden
,
trim
:
options
.
trim
||
false
};
};
return
this
.
changeState
(
state_dict
);
return
this
.
changeState
(
state_dict
);
})
})
...
@@ -104,10 +106,14 @@
...
@@ -104,10 +106,14 @@
if
(
input
.
checked
)
{
if
(
input
.
checked
)
{
result
[
input
.
getAttribute
(
'
name
'
)]
=
input
.
value
;
result
[
input
.
getAttribute
(
'
name
'
)]
=
input
.
value
;
}
}
}
else
{
if
(
this
.
state
.
trim
)
{
result
[
input
.
getAttribute
(
'
name
'
)]
=
input
.
value
.
trim
();
}
else
{
}
else
{
result
[
input
.
getAttribute
(
'
name
'
)]
=
input
.
value
;
result
[
input
.
getAttribute
(
'
name
'
)]
=
input
.
value
;
}
}
}
}
}
return
result
;
return
result
;
})
})
...
@@ -122,6 +128,9 @@
...
@@ -122,6 +128,9 @@
}
}
}
else
{
}
else
{
result
=
input
.
value
;
result
=
input
.
value
;
if
(
this
.
state
.
trim
)
{
result
=
result
.
trim
();
}
}
}
return
result
;
return
result
;
})
})
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_html5_input_js.xml
View file @
c48dae88
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
955.
22004.39620.55808
</string>
</value>
<value>
<string>
955.
51162.4768.35123
</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>
14
79376608.94
</float>
<float>
14
81623333.62
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment