Changeset 2547 for trunk/phpgwapi

Timestamp:

04/15/10 11:19:50 (14 years ago)

Author:

amuller

Message:

Ticket #1036 - Corrigindo js e otimizando a criação do jspack

Location:

trunk/phpgwapi

Files:

• inc/class.common.inc.php (modified) (1 diff)
• inc/class.javascript.inc.php (modified) (1 diff)
• js/dJSWin (modified) (1 prop)
• js/dJSWin/dJSWin.js (modified) (5 diffs)
• js/dTabs (modified) (1 prop)
• js/dftree (modified) (1 prop)
• js/dftree/dftree.js (modified) (21 diffs)
• js/expressoAjax (modified) (1 prop)
• js/jscalendar (modified) (1 prop)
• js/jscalendar/lang (modified) (1 prop)
• js/tools (modified) (1 prop)
• js/venus (modified) (1 prop)
• js/wz_dragdrop (modified) (1 prop)

trunk/phpgwapi/inc/class.common.inc.php

@@ -1232 +1232 @@
                         $GLOBALS['phpgw']->js->validate_file('wz_dragdrop','wz_dragdrop');
 
-                        echo "<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>";
+                        echo "\n<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>\n";
                         echo $GLOBALS['phpgw']->js->get_script_links();
 

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

@@ -134 +134 @@
                                                                         if ($GLOBALS['phpgw_info']['server']['jspacker'] == "True")
                                                                         {
-                                                                                require_once('class.JavaScriptPacker.php');
-                                                                                $script = file_get_contents(PHPGW_INCLUDE_ROOT .SEP .$app .SEP .'js' .SEP . $pkg .SEP. $file . '.js');
-                                                                                $packer = new JavaScriptPacker($script, 'Normal', true, false);
-                                                                                $packed = $packer->pack();
-                                                                                $links .= "<script>".$packed."</script>\n";
-                                                                        }
+                                                                                $filePath=PHPGW_INCLUDE_ROOT.SEP.$app.SEP.'js'.SEP.$pkg.SEP.$file.'.js';
+                                                                                if (!file_exists($filePath."pack.js"))
+                                                                                {
+                                                                                        $fp = fopen($filePath."pack.js", 'w');
+                                                                                        $script = file_get_contents($filePath);
+                                                                                        require_once('class.JavaScriptPacker.php');
+                                                                                        $packer = new JavaScriptPacker($script, 'Normal', true, false);
+                                                                                        $packed = $packer->pack();
+                                                                                        fwrite($fp, $packed);
+                                                                                        fclose($fp);
+                                                                                }
+                                                                                $links .= '<script type="text/javascript" src="'
+                                                                                        .$GLOBALS['phpgw_info']['server']['webserver_url']
+                                                                                        ."/$app/js/$pkg/$file" . ".jspack.js\"></script>\n";
+                                                                        }       
                                                                         else
                                                                         {

trunk/phpgwapi/js/dJSWin/dJSWin.js

@@ -37 +37 @@
         {
                 is_ie = false;
-                is_ie5 = false
+                is_ie5 = false;
                 is_moz1_6 = false;
                 is_mozilla = false;
@@ -338 +338 @@
                 /* Turn the attribute visible false */
                 this.visible = false;
-        }
+        };
 
         dJSWin.prototype.open = function()
@@ -368 +368 @@
                 /* Turn the attribute visible true */
                 this.visible = true;
-        }
+        };
 
         dJSWin.prototype.show = function()
         {
                 this.open();
-        }
+        };
 
         dJSWin.prototype.hide = function()
         {
                 this.close();
-        }
+        };
 
         dJSWin.prototype.moveTo = function(x,y)
         {
                 dd.elements[this.title.id].moveTo(x,y);
-        }
+        };
 
         dJSWin.prototype.x = function()
         {
                 return dd.elements[this.title.id].x;
-        }
+        };
 
         dJSWin.prototype.y = function()
         {
                 return dd.elements[this.title.id].y;
-        }
+        };
 
         dJSWin.prototype.draw = function()
@@ -464 +464 @@
                 
                 dd.elements[this.title.id].hide();
-        }
+        };
 
         function _dJSWinElement(id)
@@ -480 +480 @@
                         throw("Browser Not Supported!");
                 }
-        }
+        };
 
         if (!dd.elements)

trunk/phpgwapi/js/dftree/dftree.js

@@ -80 +80 @@
         //cons = COokie of Node Status
         //setCookie("cons"+this.id,this._io);
-}
+};
 
 dNode.prototype.open = function () {
@@ -99 +99 @@
                 this._refresh();
         }
-}
+};
 
 
@@ -112 +112 @@
                 this._refresh();
         }
-}
+};
 
 //alter node label and other properties
@@ -124 +124 @@
                 }
         }
-}
+};
 
 //css and dhtml refresh part
@@ -156 +156 @@
 //alter onLoad, etc
 
-}
+};
 
 //gets the proper plus for this moment
@@ -183 +183 @@
                 }
         }
-}
+};
 
 //changes node to selected style class. Perform further actions.
@@ -218 +218 @@
         }
 
-}
+};
 
 //changes node background color.
@@ -231 +231 @@
                 captionSpan.style.paddingBottom = '0px';
         }
-}
+};
 //changes node background color.
 dNode.prototype._onMouseOut = function()
@@ -243 +243 @@
                 captionSpan.style.paddingBottom = '1px';
         }
-}
+};
 
 //changes node to unselected style class. Perform further actions.
@@ -258 +258 @@
                 captionSpan.className = this.captionClass;
         }
-}
+};
 
 
@@ -359 +359 @@
                 parentChildrenDiv.appendChild(divN);
         }
-}
+};
 
 // TREE 
@@ -407 +407 @@
                 }
         }
-}
+};
 
 dFTree.prototype.draw = function(dest_element) {
@@ -426 +426 @@
         }
 
-}
+};
 
 //Transforms tree in HTML code
@@ -443 +443 @@
                 this._drawBranch(this.root.children);
         }*/
-}
+};
 
 //Recursive function, draws children
@@ -453 +453 @@
                 this._drawBranch(childrenArray[a]._children);
         }
-}
+};
 
 //add into a position
@@ -515 +515 @@
         }
 
-}
+};
 
 //arrayProps: same properties of Node
 dFTree.prototype.alter = function(arrayProps) {
         this.getNodeById(arrayProps['id']).alter(arrayProps);
-}
+};
 
 dFTree.prototype.getNodeById = function(nodeid) {
         return this._aNodes[this._searchNode(nodeid)];
-}
+};
 
 dFTree.prototype.openTo = function(nodeid)
@@ -535 +535 @@
                 this.openTo(node._parent.id);
         }
-}
+};
 
 //Searches for a node in the node array, returning the position of the array 4it
@@ -548 +548 @@
         }
         return false;
-}
+};
 // By jakjr, retorna um array com os ids de todas as pastas (nodes)
 dFTree.prototype.getNodesList = function(imapDelimiter) {
@@ -572 +572 @@
         }
         return nodes;
-}
+};
 
 //Auxiliar functions
@@ -591 +591 @@
     }
     return false;
-}
+};
 
 // [Cookie] Clears a cookie
@@ -637 +637 @@
         }
         return "<img "+attributes+" src=\""+src+"\">";
-}
+};