attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
This commit is contained in:
parent
da442b024c
commit
3bb7ee521f
|
@ -322,6 +322,7 @@ $(document).ready(function() {
|
||||||
if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
|
if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
|
||||||
delete uploadingFiles[dirName];
|
delete uploadingFiles[dirName];
|
||||||
}
|
}
|
||||||
|
//TODO update file upload size limit
|
||||||
|
|
||||||
var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
|
var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
|
||||||
var currentUploads = parseInt(uploadtext.attr('currentUploads'));
|
var currentUploads = parseInt(uploadtext.attr('currentUploads'));
|
||||||
|
@ -375,6 +376,7 @@ $(document).ready(function() {
|
||||||
if(size==t('files','Pending')){
|
if(size==t('files','Pending')){
|
||||||
$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
|
$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
|
||||||
}
|
}
|
||||||
|
//TODO update file upload size limit
|
||||||
FileList.loadingDone(file.name, file.id);
|
FileList.loadingDone(file.name, file.id);
|
||||||
} else {
|
} else {
|
||||||
Files.cancelUpload(this.files[0].name);
|
Files.cancelUpload(this.files[0].name);
|
||||||
|
@ -407,8 +409,10 @@ $(document).ready(function() {
|
||||||
if(size==t('files','Pending')){
|
if(size==t('files','Pending')){
|
||||||
$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
|
$('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
|
||||||
}
|
}
|
||||||
|
//TODO update file upload size limit
|
||||||
FileList.loadingDone(file.name, file.id);
|
FileList.loadingDone(file.name, file.id);
|
||||||
} else {
|
} else {
|
||||||
|
//TODO Files.cancelUpload(/*where do we get the filename*/);
|
||||||
$('#notification').text(t('files', response.data.message));
|
$('#notification').text(t('files', response.data.message));
|
||||||
$('#notification').fadeIn();
|
$('#notification').fadeIn();
|
||||||
$('#fileList > tr').not('[data-mime]').fadeOut();
|
$('#fileList > tr').not('[data-mime]').fadeOut();
|
||||||
|
|
|
@ -14,7 +14,8 @@
|
||||||
data-type='web'><p><?php echo $l->t('From link');?></p></li>
|
data-type='web'><p><?php echo $l->t('From link');?></p></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div id="upload" class="button">
|
<div id="upload" class="button"
|
||||||
|
title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>">
|
||||||
<form data-upload-id='1'
|
<form data-upload-id='1'
|
||||||
id="data-upload-form"
|
id="data-upload-form"
|
||||||
class="file_upload_form"
|
class="file_upload_form"
|
||||||
|
@ -31,8 +32,7 @@
|
||||||
value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
|
value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
|
||||||
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
|
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
|
||||||
<input type="file" id="file_upload_start" name='files[]'/>
|
<input type="file" id="file_upload_start" name='files[]'/>
|
||||||
<a href="#" class="svg" onclick="return false;"
|
<a href="#" class="svg" onclick="return false;"></a>
|
||||||
title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div id="uploadprogresswrapper">
|
<div id="uploadprogresswrapper">
|
||||||
|
|
|
@ -622,7 +622,7 @@ $(document).ready(function(){
|
||||||
$('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
|
$('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
|
||||||
$('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true});
|
$('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true});
|
||||||
$('.password .action').tipsy({gravity:'se', fade:true, live:true});
|
$('.password .action').tipsy({gravity:'se', fade:true, live:true});
|
||||||
$('#upload a').tipsy({gravity:'w', fade:true});
|
$('#upload').tipsy({gravity:'w', fade:true});
|
||||||
$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
|
$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
|
||||||
$('a.delete').tipsy({gravity: 'e', fade:true, live:true});
|
$('a.delete').tipsy({gravity: 'e', fade:true, live:true});
|
||||||
$('a.action').tipsy({gravity:'s', fade:true, live:true});
|
$('a.action').tipsy({gravity:'s', fade:true, live:true});
|
||||||
|
|
Loading…
Reference in New Issue