diff options
author | Andrew Dolgov <[email protected]> | 2010-11-21 23:05:51 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-11-21 23:05:51 +0300 |
commit | 8a097fa3819b32e58a8078270b324e12aa381188 (patch) | |
tree | ed21cf50095b01089be5e323daa2c4024a7dde9d | |
parent | bcf5ed46e304efad2da6dcb632d7b9d45df42cad (diff) |
fix preference tree elements not being properly clickable in Firefox
-rw-r--r-- | PrefFilterTree.js | 8 | ||||
-rw-r--r-- | PrefLabelTree.js | 8 | ||||
-rw-r--r-- | modules/pref-feeds.php | 4 | ||||
-rw-r--r-- | modules/pref-filters.php | 9 | ||||
-rw-r--r-- | modules/pref-labels.php | 8 | ||||
-rw-r--r-- | prefs.js | 2 |
6 files changed, 20 insertions, 19 deletions
diff --git a/PrefFilterTree.js b/PrefFilterTree.js index 6f38f8db2..a4cf3dac8 100644 --- a/PrefFilterTree.js +++ b/PrefFilterTree.js @@ -48,13 +48,5 @@ dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, { return (!item.error || item.error == '') ? "dijitTreeRow" : "dijitTreeRow Error"; }, - onClick: function (item) { - var id = String(item.id); - var bare_id = id.substr(id.indexOf(':')+1); - - if (id.match('FILTER:')) { - editFilter(bare_id, event); - } - }, }); diff --git a/PrefLabelTree.js b/PrefLabelTree.js index 47e18780a..05a0c15b6 100644 --- a/PrefLabelTree.js +++ b/PrefLabelTree.js @@ -39,13 +39,5 @@ dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, { getIconClass: function (item, opened) { return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible"; }, - onClick: function (item) { - var id = String(item.id); - var bare_id = id.substr(id.indexOf(':')+1); - - if (id.match('LABEL:')) { - editLabel(bare_id, event); - } - }, }); diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index d4bde4892..2c4503592 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -1220,9 +1220,9 @@ var bare_id = id.substr(id.indexOf(':')+1); if (id.match('FEED:')) { - editFeed(bare_id, event); + editFeed(bare_id); } else if (id.match('CAT:')) { - editCat(bare_id, item, event); + editCat(bare_id, item); } </script> <script type=\"dojo/method\" event=\"onLoad\" args=\"item\"> diff --git a/modules/pref-filters.php b/modules/pref-filters.php index cf44c55f9..805562d9b 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -435,6 +435,15 @@ <script type=\"dojo/method\" event=\"onLoad\" args=\"item\"> Element.hide(\"filterlistLoading\"); </script> + <script type=\"dojo/method\" event=\"onClick\" args=\"item\"> + var id = String(item.id); + var bare_id = id.substr(id.indexOf(':')+1); + + if (id.match('FILTER:')) { + editFilter(bare_id); + } + </script> + </div>"; print "</div>"; #pane diff --git a/modules/pref-labels.php b/modules/pref-labels.php index e381d72ff..72e6dd1e3 100644 --- a/modules/pref-labels.php +++ b/modules/pref-labels.php @@ -304,6 +304,14 @@ <script type=\"dojo/method\" event=\"onLoad\" args=\"item\"> Element.hide(\"labellistLoading\"); </script> + <script type=\"dojo/method\" event=\"onClick\" args=\"item\"> + var id = String(item.id); + var bare_id = id.substr(id.indexOf(':')+1); + + if (id.match('LABEL:')) { + editLabel(bare_id); + } + </script> </div>"; print "</div>"; #pane @@ -166,7 +166,7 @@ function editUser(id, event) { } -function editFilter(id, event) { +function editFilter(id) { try { var query = "backend.php?op=pref-filters&subop=edit&id=" + param_escape(id); |