Changeset 2549 for trunk/phpgwapi/inc/class.javascript.inc.php

Timestamp:

04/15/10 15:26:02 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problemas com a inclusão de javascript.

File:

• trunk/phpgwapi/inc/class.javascript.inc.php (modified) (3 diffs)

trunk/phpgwapi/inc/class.javascript.inc.php

@@ -49 +49 @@
                 * @var array list of validated files to be included in the head section of a page
                 */
-                var $files;
+                private $files = array( );
 
                 /**
@@ -153 +153 @@
                                                                                 $links .= '<script type="text/javascript" src="'
                                                                                         . $GLOBALS['phpgw_info']['server']['webserver_url']
-                                                                                        . "/$app/js/$pkg/$file" . '.js">'
+                                                                                        . "/$app/js/$pkg/$file" . '.js?' . microtime( true ) . '">'
                                                                                         . "</script>\n";
                                                                         }
+
+                                                                        $this -> unset_script_link( $app, $pkg, $file );
                                                                 }
                                                         }
@@ -223 +225 @@
                 * @returns bool was the file found?
                 */
-                function validate_file($package, $file, $app='phpgwapi')
-                {
-                        if(is_readable(PHPGW_INCLUDE_ROOT .SEP .$app .SEP .'js' .SEP . $package .SEP. $file . '.js'))
-                        {
-                                $this->files[$app][$package][$file] = $file;
-                                return True;
-                        }
-                        elseif($app != 'phpgwapi')
-                        {
-                                if(is_readable(PHPGW_INCLUDE_ROOT .SEP .'phpgwapi' .SEP .'js' .SEP . $package .SEP . $file . '.js'))
-                                {
-                                        $this->files['phpgwapi'][$package][$file] = $file;
-                                        return True;
-                                }
-                                return False;
-                        }
+                function validate_file( $package, $file, $app = NULL, $stack = false )
+                {
+                        if ( $app == NULL )
+                                $app = 'phpgwapi';
+
+                        $_file = PHPGW_INCLUDE_ROOT . SEP . $app . SEP . 'js' . SEP . $package . SEP. $file . '.js';
+                        if ( is_readable( $_file ) )
+                        {
+                                unset( $_file );
+
+                                if ( ! array_key_exists( $app, $this -> files ) )
+                                        $this -> files[ $app ] = array( );
+
+                                if ( ! array_key_exists( $package, $this -> files[ $app ] ) )
+                                        $this -> files[ $app ][ $package ] = array( );
+
+                                if ( $stack )
+                                        $this -> files[ $app ][ $package ] = array_merge( array( $file => $file ), $this -> files[ $app ][ $package ] );
+                                else
+                                        $this -> files[ $app ][ $package ][ $file ] = $file;
+
+                                return true;
+                        }
+                        return false;
                 }
         }