Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
6df0d7ed
Commit
6df0d7ed
authored
Aug 21, 2009
by
webchick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#552520
by merlinofchaos: Fixed AJAX wrappers on poll/upload modules.
parent
db61b260
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
includes/ajax.inc
includes/ajax.inc
+1
-1
modules/poll/poll.module
modules/poll/poll.module
+0
-2
modules/upload/upload.module
modules/upload/upload.module
+3
-4
No files found.
includes/ajax.inc
View file @
6df0d7ed
...
...
@@ -363,7 +363,7 @@ function ajax_command_alert($text) {
/**
* Creates a Drupal AJAX 'insert/replaceWith' command.
*
* The 'insert/replace' command instructs the client to use jQuery's
* The 'insert/replace
With
' command instructs the client to use jQuery's
* replaceWith() method to replace each element matched matched by the given
* selector with the given HTML.
*
...
...
modules/poll/poll.module
View file @
6df0d7ed
...
...
@@ -378,8 +378,6 @@ function _poll_choice_form($key, $chid = NULL, $value = '', $votes = 0, $weight
function
poll_choice_js
(
$form
,
$form_state
)
{
$choice_form
=
$form
[
'choice_wrapper'
][
'choice'
];
// Prevent duplicate wrappers.
unset
(
$choice_form
[
'#prefix'
],
$choice_form
[
'#suffix'
]);
return
theme
(
'status_messages'
)
.
drupal_render
(
$choice_form
);
}
...
...
modules/upload/upload.module
View file @
6df0d7ed
...
...
@@ -236,10 +236,7 @@ function upload_form_alter(&$form, $form_state, $form_id) {
);
// Wrapper for fieldset contents (used by ajax.js).
$form
[
'attachments'
][
'wrapper'
]
=
array
(
'#prefix'
=>
'<div id="attach-wrapper">'
,
'#suffix'
=>
'</div>'
,
);
$form
[
'attachments'
][
'wrapper'
]
=
array
();
// Make sure necessary directories for upload.module exist and are
// writable before displaying the attachment form.
...
...
@@ -533,6 +530,8 @@ function _upload_form($node) {
$form
=
array
(
'#theme'
=>
'upload_form_new'
,
'#cache'
=>
TRUE
,
'#prefix'
=>
'<div id="attach-wrapper">'
,
'#suffix'
=>
'</div>'
,
);
if
(
!
empty
(
$node
->
files
)
&&
is_array
(
$node
->
files
))
{
...
...
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