summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-08-12 08:29:23 +0300
committerAndrew Dolgov <[email protected]>2015-08-12 08:29:23 +0300
commitbe2cfc1fff8792715e059249939a1a798779d777 (patch)
treee92b56f38f30af15c6dff677ca22fb8fe0190920 /js
parent90da4ada664443704dca6119c12bb7ecccb48aa9 (diff)
parentb87744534a5250e9f839997f8eceb5b86b8c0e5c (diff)
Merge branch 'master' of git.fakecake.org:tt-rss
Diffstat (limited to 'js')
-rw-r--r--js/functions.js20
1 files changed, 14 insertions, 6 deletions
diff --git a/js/functions.js b/js/functions.js
index 98a531851..a0f954e07 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -591,15 +591,21 @@ function filterDlgCheckAction(sender) {
}
// if selected action supports parameters, enable params field
- if (action == 4 || action == 6 || action == 7) {
+ if (action == 4 || action == 6 || action == 7 || action == 9) {
new Effect.Appear(action_param, {duration : 0.5});
- if (action != 7) {
- Element.show(dijit.byId("filterDlg_actionParam").domNode);
- Element.hide(dijit.byId("filterDlg_actionParamLabel").domNode);
- } else {
+
+ Element.hide(dijit.byId("filterDlg_actionParam").domNode);
+ Element.hide(dijit.byId("filterDlg_actionParamLabel").domNode);
+ Element.hide(dijit.byId("filterDlg_actionParamPlugin").domNode);
+
+ if (action == 7) {
Element.show(dijit.byId("filterDlg_actionParamLabel").domNode);
- Element.hide(dijit.byId("filterDlg_actionParam").domNode);
+ } else if (action == 9) {
+ Element.show(dijit.byId("filterDlg_actionParamPlugin").domNode);
+ } else {
+ Element.show(dijit.byId("filterDlg_actionParam").domNode);
}
+
} else {
Element.hide(action_param);
}
@@ -966,6 +972,8 @@ function createNewActionElement(parentNode, replaceNode) {
if (form.action_id.value == 7) {
form.action_param.value = form.action_param_label.value;
+ } else if (form.action_id.value == 9) {
+ form.action_param.value = form.action_param_plugin.value;
}
var query = "backend.php?op=pref-filters&method=printactionname&action="+