Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
ba7865c0
Commit
ba7865c0
authored
Feb 17, 2017
by
Rafael Ostertag
Browse files
FieldTemplate.js: replace `%d` in `<label>` text when no children are present.
parent
11ba46c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
javascript/src/FieldTemplate.js
View file @
ba7865c0
...
...
@@ -144,6 +144,10 @@ var QfqNS = QfqNS || {};
$element
.
data
(
this
.
name
,
this
.
value
);
}
});
if
(
n
.
isTextRetainable
(
$element
))
{
$element
.
data
(
'
element-text
'
,
$element
.
text
());
}
});
return
$deserializedTemplate
;
...
...
@@ -162,9 +166,32 @@ var QfqNS = QfqNS || {};
this
.
value
=
n
.
replacePlaceholder
(
retainedPlaceholder
,
value
);
}
});
if
(
n
.
hasRetainedText
(
$element
))
{
$element
.
text
(
n
.
replacePlaceholder
(
$element
.
data
(
'
element-text
'
),
value
));
}
});
};
/**
* @private
* @param $element
* @returns {*}
*/
n
.
isTextRetainable
=
function
(
$element
)
{
return
$element
.
is
(
"
label
"
)
&&
$element
.
text
().
indexOf
(
'
%d
'
)
!==
-
1
&&
$element
.
children
().
length
===
0
;
};
/**
* @private
* @param $element
* @returns {boolean}
*/
n
.
hasRetainedText
=
function
(
$element
)
{
return
$element
.
data
(
'
element-text
'
)
!==
undefined
;
};
/**
* @private
* @param targetSelector
...
...
mockup/fieldtemplates.html
View file @
ba7865c0
...
...
@@ -37,11 +37,11 @@
<script
id=
"template"
type=
"text/template"
>
<
div
class
=
"
form-inline qfq-line
"
>
<
div
class
=
"
form-group
"
>
<
label
for
=
"
id1_%d
"
class
=
"
control-label
"
>
Zeile
(
A
-
K
)
<
/label
>
<
label
for
=
"
id1_%d
"
class
=
"
control-label
"
>
Zeile
(
A
-
K
)
%
d
<
/label
>
<
input
id
=
"
id1_%d
"
type
=
"
text
"
class
=
"
form-control
"
name
=
"
name1_%d
"
>
<
/div
>
<
div
class
=
"
form-group
"
>
<
label
for
=
"
id2_%d
"
class
=
"
control-label
"
>
Zeile
(
1
-
10
)
<
/label
>
<
label
for
=
"
id2_%d
"
class
=
"
control-label
"
>
Zeile
(
1
-
10
)
%
d
<
/label
>
<
input
id
=
"
id2_%d
"
type
=
"
text
"
class
=
"
form-control
"
name
=
"
name2_%d
"
>
<
/div
>
...
...
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