[Fmsystem-commits] [15846]

[nelson . guerra]

Revision: 15846
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15846
Author:   nelson224
Date:     2016-10-18 02:29:27 +0000 (Tue, 18 Oct 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/phpgwapi/inc/class.jquery.inc.php

Modified: branches/dev-syncromind-2/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- branches/dev-syncromind-2/phpgwapi/inc/class.jquery.inc.php 2016-10-18 
02:29:16 UTC (rev 15845)
+++ branches/dev-syncromind-2/phpgwapi/inc/class.jquery.inc.php 2016-10-18 
02:29:27 UTC (rev 15846)
@@ -196,8 +196,9 @@
                                                
"file-upload/js/jquery.fileupload-jquery-ui",
                                        );
                                                
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/file-upload/css/jquery.fileupload.css");
+                                               
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/file-upload/css/jquery.fileupload-ui.css");
                                                
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/file-upload/css/jquery.fileupload-custom.css");
-                                               
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/file-upload/css/jquery.fileupload-ui.css");
+                                               
                                        break;
                                
                                default:
@@ -485,6 +486,12 @@
                        $GLOBALS['phpgw']->js->add_code('', $js);
                }
                
+               public static function init_multi_upload_file()
+               {
+                       self::load_widget('file-upload');
+               }
+               
+               /*
                public static function form_file_upload_generate( $action )
                {
                        self::load_widget('file-upload');
@@ -611,6 +618,6 @@
                        $GLOBALS['phpgw']->js->add_code('', $js);
                        
                        return $output;
-               }
+               }*/
                
        }
\ No newline at end of file