diff options
author | Andrew Dolgov <[email protected]> | 2018-12-02 12:03:28 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2018-12-02 12:03:28 +0300 |
commit | f26d404890a55a34ed5779b6f36e949d38705e8d (patch) | |
tree | 8578175725bce862828739b80f9ac18de767b7ce /classes/pref | |
parent | 60cd4676943169a057518634e3060745e9112511 (diff) |
prefs: move other tree-related functions to respective trees
Diffstat (limited to 'classes/pref')
-rwxr-xr-x | classes/pref/feeds.php | 2 | ||||
-rwxr-xr-x | classes/pref/filters.php | 10 | ||||
-rw-r--r-- | classes/pref/labels.php | 2 | ||||
-rw-r--r-- | classes/pref/prefs.php | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 697daeab2..f34ed33eb 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1255,7 +1255,7 @@ class Pref_Feeds extends Handler_Protected { <script type=\"dojo/method\" event=\"onLoad\" args=\"item\"> Element.hide(\"feedlistLoading\"); - checkInactiveFeeds(); + dijit.byId('feedTree').checkInactiveFeeds(); </script> </div>"; diff --git a/classes/pref/filters.php b/classes/pref/filters.php index f9b4bfb2a..8fe3bbda6 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -800,17 +800,17 @@ class Pref_Filters extends Handler_Protected { print "<button dojoType=\"dijit.form.Button\" onclick=\"return Filters.quickAddFilter()\">". __('Create filter')."</button> "; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return joinSelectedFilters()\">". + print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterTree').joinSelectedFilters()\">". __('Combine')."</button> "; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return editSelectedFilter()\">". + print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterTree').editSelectedFilter()\">". __('Edit')."</button> "; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return resetFilterOrder()\">". + print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterTree').resetFilterOrder()\">". __('Reset sort order')."</button> "; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return removeSelectedFilters()\">". + print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterTree').removeSelectedFilters()\">". __('Remove')."</button> "; print "</div>"; # toolbar @@ -840,7 +840,7 @@ class Pref_Filters extends Handler_Protected { var bare_id = id.substr(id.indexOf(':')+1); if (id.match('FILTER:')) { - editFilter(bare_id); + dijit.byId('filterTree').editFilter(bare_id); } </script> diff --git a/classes/pref/labels.php b/classes/pref/labels.php index ae68a6eb7..c52f8bd79 100644 --- a/classes/pref/labels.php +++ b/classes/pref/labels.php @@ -310,7 +310,7 @@ class Pref_Labels extends Handler_Protected { var bare_id = id.substr(id.indexOf(':')+1); if (id.match('LABEL:')) { - editLabel(bare_id); + dijit.byId('labelTree').editLabel(bare_id); } </script> </div>"; diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index ccbc829a3..47062f739 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -436,7 +436,7 @@ class Pref_Prefs extends Handler_Protected { onComplete: function(transport) { var msg = transport.responseText; if (quit) { - gotoMain(); + document.location.href = 'index.php'; } else { if (msg == 'PREFS_NEED_RELOAD') { window.location.reload(); |