attach max upload tipsy to div instead of a to fix tooltip not showing due to new...

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 6d19a341e9edd84ad19439931d92e573c868ff0d..038660e6e49e37e0c26cc8a931d13083d6dd0d12 100644 (file)
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -322,6 +322,7 @@ $(document).ready(function() {
                                                                                        if ($.assocArraySize(uploadingFiles[dirName]) == 0) {
                                                                                                delete uploadingFiles[dirName];
                                                                                        }
+                                                                                       //TODO update file upload size limit
 
                                                                                        var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
                                                                                        var currentUploads = parseInt(uploadtext.attr('currentUploads'));
@@ -375,6 +376,7 @@ $(document).ready(function() {
                                                                                                if(size==t('files','Pending')){
                                                                                                        $('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
                                                                                                }
+                                                                                               //TODO update file upload size limit
                                                                                                FileList.loadingDone(file.name, file.id);
                                                                                        } else {
                                                                                                Files.cancelUpload(this.files[0].name);
@@ -407,8 +409,10 @@ $(document).ready(function() {
                                                                if(size==t('files','Pending')){
                                                                        $('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
                                                                }
+                                                               //TODO update file upload size limit
                                                                FileList.loadingDone(file.name, file.id);
                                                        } else {
+                                                               //TODO Files.cancelUpload(/*where do we get the filename*/);
                                                                $('#notification').text(t('files', response.data.message));
                                                                $('#notification').fadeIn();
                                                                $('#fileList > tr').not('[data-mime]').fadeOut();

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 3bcb865ccdbafd881765c8b1637e57f2086b2601..2e0772443f2f3dbd8e124f82ceffe1e07197e124 100644 (file)
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -14,7 +14,8 @@
                                                data-type='web'><p><?php echo $l->t('From link');?></p></li>
                                </ul>
                        </div>
-                       <div id="upload" class="button">
+                       <div id="upload" class="button"
+                                title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>">
                                <form data-upload-id='1'
                                          id="data-upload-form"
                                          class="file_upload_form"
@@ -31,8 +32,7 @@
                                                   value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
                                        <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
                                        <input type="file" id="file_upload_start" name='files[]'/>
-                                       <a href="#" class="svg" onclick="return false;"
-                                          title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+                                       <a href="#" class="svg" onclick="return false;"></a>
                                </form>
                        </div>
                        <div id="uploadprogresswrapper">

diff --git a/core/js/js.js b/core/js/js.js
index 9f3e8f921004cc1d6864e5ee102333d3a242e5f8..95889ac8a277147954e8744ee551a93ff72e0b71 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -622,7 +622,7 @@ $(document).ready(function(){
        $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
        $('.jp-controls .jp-next').tipsy({gravity:'n', 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});
        $('a.delete').tipsy({gravity: 'e', fade:true, live:true});
        $('a.action').tipsy({gravity:'s', fade:true, live:true});