Commit a12ca2cd authored by webchick's avatar webchick

Issue #1366854 by quicksketch: Added Pass #size attribute to the child upload...

Issue #1366854 by quicksketch: Added Pass #size attribute to the child upload field in the managed_file() element.
parent 5834887f
......@@ -72,6 +72,7 @@ function file_element_info() {
'#progress_message' => NULL,
'#upload_validators' => array(),
'#upload_location' => NULL,
'#size' => 22,
'#extended' => FALSE,
'#attached' => array(
'css' => array($file_path . '/file.admin.css'),
......@@ -443,7 +444,7 @@ function file_managed_file_process($element, &$form_state, $form) {
'#type' => 'file',
'#title' => t('Choose a file'),
'#title_display' => 'invisible',
'#size' => 22,
'#size' => $element['#size'],
'#theme_wrappers' => array(),
'#weight' => -10,
);
......
......@@ -239,6 +239,10 @@ class FileManagedFileElementTestCase extends FileFieldTestCase {
* Tests the managed_file element type.
*/
function testManagedFile() {
// Check that $element['#size'] is passed to the child upload element.
$this->drupalGet('file/test');
$this->assertFieldByXpath('//input[@name="files[nested_file]" and @size="13"]', NULL, 'The custom #size attribute is passed to the child upload element.');
// Perform the tests with all permutations of $form['#tree'] and
// $element['#extended'].
foreach (array(0, 1) as $tree) {
......
......@@ -37,6 +37,7 @@ function file_module_test_form($form, &$form_state, $tree = TRUE, $extended = FA
'#upload_location' => 'public://test',
'#progress_message' => t('Please wait...'),
'#extended' => (bool) $extended,
'#size' => 13,
);
if ($default_fid) {
$form['nested']['file']['#default_value'] = $extended ? array('fid' => $default_fid) : $default_fid;
......
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