From 8ef816d8f8ee964d5ce54e28e1f2686caf9176fd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 6 Jun 2022 09:31:37 +0300 Subject: [PATCH] feeds-tree: move external onClick dojo/method to PrefFeedTree class --- classes/pref/feeds.php | 10 ---------- js/PrefFeedTree.js | 13 ++++++++++++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 03b70580b..bb638f166 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -973,16 +973,6 @@ class Pref_Feeds extends Handler_Protected { persist="true" model="feedModel" openOnClick="false"> - diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js index 0585173c9..85b262b6d 100644 --- a/js/PrefFeedTree.js +++ b/js/PrefFeedTree.js @@ -1,5 +1,5 @@ /* eslint-disable prefer-rest-params */ -/* global __, lib, dijit, define, dojo, CommonDialogs, Notify, Tables, xhrPost, xhr, fox, App */ +/* global __, lib, dijit, define, dojo, CommonDialogs, Notify, Tables, xhr, fox, App */ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_base/array", "dojo/cookie"], function (declare, domConstruct, checkBoxTree, array, cookie) { @@ -14,6 +14,17 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b this.checkInactiveFeeds(); this.checkErrorFeeds(); }); + + dojo.connect(this, 'onClick', (item) => { + const id = String(item.id); + const bare_id = id.substr(id.indexOf(':')+1); + + if (id.match('FEED:')) { + CommonDialogs.editFeed(bare_id); + } else if (id.match('CAT:')) { + dijit.byId('feedTree').editCategory(bare_id, item); + } + }); }, // save state in localStorage instead of cookies // reference: https://stackoverflow.com/a/27968996