Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
8bcb106f
Commit
8bcb106f
authored
Apr 19, 2016
by
Carsten Rose
Browse files
Merge remote-tracking branch 'origin/raos_work' into crose_work
parents
78aa1845
23650113
Changes
3
Hide whitespace changes
Inline
Side-by-side
javascript/src/Form.js
View file @
8bcb106f
...
...
@@ -25,7 +25,7 @@ var QfqNS = QfqNS || {};
// On text input elements, we specifically bind this events, in order to update the formChanged property
// immediately, not only after loosing focus.
this
.
$form
.
find
(
"
input[type=text]
"
).
on
(
"
input paste
"
,
this
.
changeHandler
.
bind
(
this
));
this
.
$form
.
find
(
"
input[type=text]
, textarea
"
).
on
(
"
input paste
"
,
this
.
changeHandler
.
bind
(
this
));
};
n
.
Form
.
prototype
.
on
=
n
.
EventEmitter
.
onMixin
;
...
...
javascript/src/QfqForm.js
View file @
8bcb106f
...
...
@@ -431,25 +431,39 @@ var QfqNS = QfqNS || {};
if
(
data
[
'
form-update
'
])
{
this
.
applyElementConfiguration
(
data
[
'
form-update
'
]);
}
return
;
}
return
;
if
(
data
.
redirect
===
"
client
"
)
{
window
.
history
.
back
();
return
;
}
if
(
data
.
redirect
===
"
url
"
||
data
[
'
redirect-url
'
])
{
window
.
location
=
data
[
'
redirect-url
'
];
return
;
}
break
;
case
'
new
'
:
var
target
=
this
.
getNewButtonTarget
();
window
.
location
=
this
.
getNewButtonTarget
();
return
;
}
if
(
data
.
redirect
===
"
client
"
)
{
window
.
history
.
back
();
return
;
}
default
:
if
(
data
.
redirect
===
"
client
"
)
{
window
.
history
.
back
();
return
;
}
if
(
data
.
redirect
===
"
url
"
||
data
[
'
redirect-url
'
])
{
window
.
location
=
data
[
'
redirect-url
'
];
return
;
if
(
data
.
redirect
===
"
url
"
||
data
[
'
redirect-url
'
])
{
window
.
location
=
data
[
'
redirect-url
'
];
return
;
}
break
;
}
};
n
.
QfqForm
.
prototype
.
getNewButtonTarget
=
function
()
{
...
...
mockup/personmock.html
View file @
8bcb106f
...
...
@@ -645,6 +645,19 @@
<p
class=
"help-block"
></p>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"col-md-2"
>
<label
for=
"mytextarea"
class=
"control-label"
>
Text area
</label>
</div>
<div
class=
"col-md-6"
>
<textarea
id=
"mytextarea"
name=
"mytextarea"
></textarea>
</div>
<div
class=
" col-md-4"
>
<p
class=
"help-block"
></p>
</div>
</div>
<!--Sekretariat fuer Arbeitsgruppe (subrecord)-->
<!--Arbeitsgruppe (subrecord)-->
</div>
...
...
Write
Preview
Supports
Markdown
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