]> git.wh0rd.org - tt-rss.git/commitdiff
fix preference tree elements not being properly clickable in Firefox
authorAndrew Dolgov <fox@fakecake.org>
Sun, 21 Nov 2010 20:05:51 +0000 (23:05 +0300)
committerAndrew Dolgov <fox@fakecake.org>
Sun, 21 Nov 2010 20:05:51 +0000 (23:05 +0300)
PrefFilterTree.js
PrefLabelTree.js
modules/pref-feeds.php
modules/pref-filters.php
modules/pref-labels.php
prefs.js

index 6f38f8db278640aa67687f26353249bbe3d918ae..a4cf3dac8a2fe7d72bcccc1093760707669bd8f2 100644 (file)
@@ -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);
-               }                       
-       },
 });
 
index 47e18780a30f71fc6cfa5ee9a86e2f34097ffaab..05a0c15b69812658b57f94dc7b2ffed2a943dbb4 100644 (file)
@@ -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);
-               }                       
-       },
 });
 
index d4bde4892e24a660fd6d97c9cdf9a20c1cea54c5..2c4503592e22e5fabddeea8f01cf804287373ca6 100644 (file)
                        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\">
index cf44c55f9a6b30f4cf1a6426ce0622421c4f417b..805562d9bc842718e073228fd5e46b1f5f6b23eb 100644 (file)
                <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
index e381d72ff769155d1171d6cf24a6e570a1428e3a..72e6dd1e3197ae9189132544a64efbf613b1185f 100644 (file)
                <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
index 0eb570f5f3d660476582e9618f4c6dda5801faf5..55e29d2af613b65473e80f6510f81cbb0406b289 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -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);