Commiting fix for bug #1571225, thanks to ioguix. This may cause problems in 1.0...

diff --git a/classes/Misc.php b/classes/Misc.php
index 2cdb75db63b57618e70d52e8632d6eb6fd91d804..49b6f58d77ea002905e26a304aeec316b48e2a70 100644 (file)
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -2,7 +2,7 @@
        /**
         * Class to hold various commonly used functions
         *
-        * $Id: Misc.php,v 1.134 2006/09/14 20:54:27 xzilla Exp $
+        * $Id: Misc.php,v 1.135 2006/10/31 16:04:12 xzilla Exp $
         */
         
        class Misc {
@@ -1659,14 +1659,14 @@
                                        
                                        $icon = $this->icon(value($attrs['icon'], $rec));
                                        echo value_xml_attr('icon', $icon, $rec);
-                                       echo value_xml_attr('iconAction', $attrs['iconAction'], $rec);
+                                       echo value_xml_attr('iconaction', $attrs['iconAction'], $rec);
                                        
-                                       if (!empty($attrs['openIcon'])) {
+                                       if (!empty($attrs['openicon'])) {
                                                $icon = $this->icon(value($attrs['openIcon'], $rec));
                                        }
-                                       echo value_xml_attr('openIcon', $icon, $rec);
+                                       echo value_xml_attr('openicon', $icon, $rec);
                                        
-                                       echo value_xml_attr('toolTip', $attrs['toolTip'], $rec);
+                                       echo value_xml_attr('tooltip', $attrs['toolTip'], $rec);
                                        
                                        echo "/>\n";
                                        

diff --git a/xloadtree/xloadtree2.js b/xloadtree/xloadtree2.js
index ccdd69fc8f5b1d2be91bc2ecaf5156128846a67d..87dbc6d181b3036d9c5009b7473dc18cf9ffe3b1 100644 (file)
--- a/xloadtree/xloadtree2.js
+++ b/xloadtree/xloadtree2.js
@@ -304,7 +304,7 @@ WebFXLoadTree.createItemFromElement = function (oNode) {
                action = jsAttrs.action;\r
        }\r
        var jsNode = new WebFXLoadTreeItem(jsAttrs.html || "", jsAttrs.src, action,\r
-                                                                               null, jsAttrs.icon, jsAttrs.iconAction, jsAttrs.openIcon);\r
+                                                                               null, jsAttrs.icon, jsAttrs.iconaction, jsAttrs.openicon);\r
        if (jsAttrs.text) {\r
                jsNode.setText(jsAttrs.text);\r
        }\r
@@ -315,8 +315,8 @@ WebFXLoadTree.createItemFromElement = function (oNode) {
        if (jsAttrs.id) {\r
                jsNode.setId(jsAttrs.id);\r
        }\r
-       if (jsAttrs.toolTip) {\r
-               jsNode.toolTip = jsAttrs.toolTip;\r
+       if (jsAttrs.tooltip) {\r
+               jsNode.toolTip = jsAttrs.tooltip;\r
        }\r
        if (jsAttrs.expanded) {\r
                jsNode.setExpanded(jsAttrs.expanded != "false");\r