summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxzilla2006-10-31 16:04:12 +0000
committerxzilla2006-10-31 16:04:12 +0000
commitb47314f170228cd1a94d4e19cdee6c8263dfad9d (patch)
tree35d7d06e774368384edf618b8ec6e8c9f223356f
parentadb309dbd9ce7dd7d2265224991c60836d465aaa (diff)
Commiting fix for bug #1571225, thanks to ioguix. This may cause problems in 1.0.x versions of Firefox, we'll see.
-rw-r--r--classes/Misc.php10
-rw-r--r--xloadtree/xloadtree2.js6
2 files changed, 8 insertions, 8 deletions
diff --git a/classes/Misc.php b/classes/Misc.php
index 2cdb75db..49b6f58d 100644
--- 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 ccdd69fc..87dbc6d1 100644
--- a/xloadtree/xloadtree2.js
+++ b/xloadtree/xloadtree2.js
@@ -304,7 +304,7 @@ WebFXLoadTree.createItemFromElement = function (oNode) {
action = jsAttrs.action;
}
var jsNode = new WebFXLoadTreeItem(jsAttrs.html || "", jsAttrs.src, action,
- null, jsAttrs.icon, jsAttrs.iconAction, jsAttrs.openIcon);
+ null, jsAttrs.icon, jsAttrs.iconaction, jsAttrs.openicon);
if (jsAttrs.text) {
jsNode.setText(jsAttrs.text);
}
@@ -315,8 +315,8 @@ WebFXLoadTree.createItemFromElement = function (oNode) {
if (jsAttrs.id) {
jsNode.setId(jsAttrs.id);
}
- if (jsAttrs.toolTip) {
- jsNode.toolTip = jsAttrs.toolTip;
+ if (jsAttrs.tooltip) {
+ jsNode.toolTip = jsAttrs.tooltip;
}
if (jsAttrs.expanded) {
jsNode.setExpanded(jsAttrs.expanded != "false");