summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-08-12 11:42:41 +0200
committerRobin Appelman <icewind1991@gmail.com>2011-08-12 11:50:07 +0200
commit9ba303a95f22e881a2f2cc8657645560ca646d05 (patch)
tree5fa5728c95b608c9de32cb8ee3ef97ea92dbc83a /files
parent6c4d075bd656497e793c230818c53fa085cbbbf9 (diff)
downloadnextcloud-server-9ba303a95f22e881a2f2cc8657645560ca646d05.tar.gz
nextcloud-server-9ba303a95f22e881a2f2cc8657645560ca646d05.zip
fix uploading multiple files
Diffstat (limited to 'files')
-rw-r--r--files/css/files.css2
-rw-r--r--files/js/files.js4
-rw-r--r--files/templates/index.php4
3 files changed, 5 insertions, 5 deletions
diff --git a/files/css/files.css b/files/css/files.css
index 2ff985cfc3b..7901c3c6a0e 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -11,7 +11,7 @@
#fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .3em; padding-left:2em; }
.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin-right:1.5em;}
-.file_upload_wrapper #file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
+.file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:bold; width:8em; }
.file_upload_start, .file_upload_filename { font-size:1em; }
diff --git a/files/js/files.js b/files/js/files.js
index 8fd4b95ec7b..e8d2b5d9f5a 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -13,8 +13,8 @@ $(document).ready(function() {
$('#plugins>ul>li:first-child').droppable(crumbDropOptions);
// Triggers invisible file input
- $('#file_upload_button_wrapper').bind('click', function() {
- $('#file_upload_start').trigger('click');
+ $('.file_upload_button_wrapper').live('click', function() {
+ $(this).parent().children('.file_upload_start').trigger('click');
return false;
});
diff --git a/files/templates/index.php b/files/templates/index.php
index 7ebb6e46949..cd061596a02 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -7,8 +7,8 @@
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
<div class="file_upload_wrapper" class="svg">
<input type="submit" class="file_upload_filename" value="<?php echo $l->t('Upload'); ?>"/>
- <input id="file_upload_start" class="file_upload_start" type="file" name='files[]'/>
- <a href="#" id="file_upload_button_wrapper" onclick="return false;" title="<?php echo 'max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+ <input class="file_upload_start" class="file_upload_start" type="file" name='files[]'/>
+ <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo 'max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
</div>
<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
</form>