Changeset 3879 for branches/2.2/filemanager/js/common_functions.js

Timestamp:

03/18/11 18:18:12 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1648 - Correcao( codigo ) e melhoria( laytou/informacao ) no upload de arquivos para o servidor.

File:

• branches/2.2/filemanager/js/common_functions.js (modified) (9 diffs)

branches/2.2/filemanager/js/common_functions.js

@@ -98 +98 @@
                         
                         var pArgs = unserialize(data);
-                                pArgs.lang_add_file             = get_lang("Add file");
                                 pArgs.lang_click_here   = get_lang("Click here");
                                 pArgs.lang_more_files   = get_lang("More files");
@@ -104 +103 @@
                                 pArgs.height                    = 210;
                                 pArgs.path_filemanager  = path_filemanager;
-                                pArgs.width                     = 450;
+                                pArgs.width                     = 500;
                 
                         var _html = Xtools.parse( Xtools.xml("upload_files"), "upload.xsl", pArgs );
@@ -233 +232 @@
 
 
-function setRestricted(name){
+function setRestricted(name)
+{
         var continue_set = confirm(get_lang('This property will change the visibility of all users that have access to this file, continue?'));
-        if (continue_set)
-                cExecute_('./index.php?menuaction=filemanager.vfs_functions.setRestricted&file='+base64_encode(name)+'&path='+base64_encode(currentPath),handler.restricted);
-}
-
-function presetComments(el){
+        
+        if ( continue_set )
+        {
+                cExecute_('./index.php?menuaction=filemanager.vfs_functions.setRestricted&file='
+                                + base64_encode(name)+'&path='+base64_encode(currentPath),handler.restricted);
+        }
+}
+
+function presetComments(el)
+{
         if (permissions['edit'] == 0){
                 el.blur();
@@ -247 +252 @@
 }
 
-function setComments(el){
-        if (el.value == oldValue) return;
+function setComments(el)
+{
+        if ( el.value == oldValue )
+                return;
+        
         var filename = base64_encode(el.id);
-        cExecute_('./index.php?menuaction=filemanager.vfs_functions.editComment&file='+filename+'&comment='+base64_encode(el.value),handler.updateComment);
+        
+        cExecute_('./index.php?menuaction=filemanager.vfs_functions.editComment&file='
+                                + filename+'&comment='+base64_encode(el.value), handler.updateComment);
 }
 
@@ -320 +330 @@
                          width                  : 250,
                          height                 : 290,
-                         top                    : 100,
-                         left                   : 400,
+                         top                            : 100,
+                         left                           : 400,
                          draggable              : true,
-                         visible                : "display",
+                         visible                        : "display",
                          resizable              : true,
                          zindex                 : zIndex++,
                          title                  : "Expresso FileManager - " + get_lang('View'),
-                         closeAction    : "remove",
+                         closeAction            : "remove",
                          content                : Xtools.parse(Xtools.xml("view_config"), "view.xsl", pTools)   
                 };
@@ -369 +379 @@
         if (size < kbyte)
         {
-                return size + 'B';
+                return size + ' B';
         }
         else if (size < mbyte)
         {
-                return parseInt(size/kbyte) + 'KB';
+                return parseInt(size/kbyte) + ' KB';
         }
         else if (size < gbyte)
         {
                 if ( size/mbyte > 100)
-                        return (size/mbyte).toFixed(0) + 'MB';
+                        return (size/mbyte).toFixed(0) + ' MB';
                 else
-                        return (size/mbyte).toFixed(1) + 'MB';
+                        return (size/mbyte).toFixed(1) + ' MB';
         }
         else
         {
-                return (size/gbyte).toFixed(1) + 'GB';
+                return (size/gbyte).toFixed(1) + ' GB';
         }
 }
@@ -391 +401 @@
 {
         var newElement = document.createElement('div');
-                newElement.innerHTML  = '<input maxlength="255" name="upload_file[]" type="file" style="margin-right:5px;" />' +
-                                                                '<input name="upload_comment[]" type="text" style="margin-right:2px;" />' +
-                                                                '<span style="color:red; cursor:pointer;" onclick="removeInput(this);">'+get_lang('delete')+'</span>';
+                newElement.innerHTML  = '<div></div>' +
+                                                                        '<input maxlength="255" name="upload_file[]" type="file" style="margin-right:5px;" />' +
+                                                                        '<input name="upload_comment[]" type="text" style="margin-right:2px;" />' +
+                                                                        '<span style="color:red; cursor:pointer;" onclick="removeInput(this);">'+get_lang('delete')+'</span>';
         
         document.getElementById('uploadOption').parentNode.appendChild(newElement);
@@ -447 +458 @@
 {
         var _formUp                     = document.getElementById('form_up');
-        var _uploadFiles        = document.getElementsByTagName('input');
+        var _uploadFiles                = document.getElementsByTagName('input');
         var _flagSend           = true;
         
@@ -463 +474 @@
         
         if( _flagSend )
-        {
-                cExecuteForm_( _formUp ,handler.upload);
-        }
+                cExecuteForm_( _formUp , handler.upload );
         else
                 write_msg(get_lang("No file(s) to send") + "!");
-
-        close_window();
-}
+}