Changeset 2580

Timestamp:

04/19/10 08:46:39 (14 years ago)

Author:

amuller

Message:

Ticket #1036 - correcao indice de array, alem de aumentar a compactacao

Location:

trunk/phpgwapi

Files:

• inc/class.javascript.inc.php (modified) (2 diffs)
• js/dftree/dftree.js (modified) (3 diffs)

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

@@ -138 +138 @@
                                                                                 {
                                                                                         $filePath=PHPGW_INCLUDE_ROOT.SEP.$app.SEP.'js'.SEP.$pkg.SEP.$file.'.js';
-                                                                                        $script .= file_get_contents($filePath).";\n";
+                                                                                        $script .= file_get_contents($filePath);
                                                                                 }
                                                                         }
@@ -162 +162 @@
                                                                         $fp = fopen($filePath, 'w');
                                                                         require_once('class.JavaScriptPacker.php');
-                                                                        $packer = new JavaScriptPacker($script, 'Normal', true, false);
+                                                                        $packer = new JavaScriptPacker($script, 'High ASCII', true, true);
                                                                         $packed = $packer->pack();
                                                                         fwrite($fp, $packed);

trunk/phpgwapi/js/dftree/dftree.js

@@ -61 +61 @@
                 if (i.charAt(0) != '_')
                 {
-                        eval('this.'+i+' = arrayProps[\''+i+'\'];');
+                        eval('this.'+i+' = arrayProps["'+i+'"];');
                 }
         }
@@ -121 +121 @@
                 if (i != 'id' && i.charAt(0) != '_')
                 {
-                        eval('this.'+i+' = arrayProps[\''+i+'\'];');
+                        eval('this.'+i+' = arrayProps["'+i+'"];');
                 }
         }
@@ -404 +404 @@
                 if (i.charAt(0) != '_')
                 {
-                        eval('this.'+i+' = arrayProps[\''+i+'\'];');
+                        eval('this.'+i+' = arrayProps["'+i+'"];');
                 }
         }