summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tt-rss.js20
-rw-r--r--tt-rss.php14
2 files changed, 17 insertions, 17 deletions
diff --git a/tt-rss.js b/tt-rss.js
index 1e8b2454c..830bf0744 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -438,25 +438,25 @@ function init() {
}
function quickMenuGo() {
- var chooser = document.getElementById("quickMenuChooser");
- var opname = chooser[chooser.selectedIndex].text;
+ var chooser = document.getElementById("quickMenuChooser");
+ var opid = chooser[chooser.selectedIndex].id;
- if (opname == "Preferences") {
+ if (opid == "qmcPrefs") {
gotoPreferences();
}
- if (opname == "Extended search") {
+ if (opid == "qmcAdvSearch") {
displayDlg("search");
return;
}
- if (opname.match("Add new feed")) {
+ if (opid == "qmcAddFeed") {
displayDlg("quickAddFeed");
return;
}
- if (opname.match("Remove this feed")) {
+ if (opid == "qmcRemoveFeed") {
var actid = getActiveFeedId();
if (!actid) {
@@ -468,17 +468,17 @@ function quickMenuGo() {
return;
}
- if (opname.match("Update")) {
+ if (opid == "qmcUpdateFeeds") {
scheduleFeedUpdate(true);
return;
}
- if (opname.match("Mark as read")) {
+ if (opid == "qmcCatchupAll") {
catchupAllFeeds();
return;
}
- if (opname.match("Toggle display read")) {
+ if (opid == "qmcShowOnlyUnread") {
toggleDispRead();
return;
}
@@ -557,7 +557,7 @@ function allFeedsMenuGo() {
return;
}
- if (opname == "Toggle display read") {
+ if (opname == "Show only read") {
toggleDispRead();
return;
}
diff --git a/tt-rss.php b/tt-rss.php
index 8a2154957..88dc8876e 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -69,7 +69,7 @@
<select id="allFeedsChooser">
<option>Update</option>
<option>Mark as read</option>
- <option>Toggle display read</option>
+ <option>Show only unread</option>
</select>
<input type="submit" class="button" onclick="allFeedsMenuGo()" value="Go">
@@ -142,17 +142,17 @@
</td>
<td align="right">
Actions: <select id="quickMenuChooser">
- <option selected>Preferences</option>
+ <option id="qmcPrefs" selected>Preferences...</option>
<option disabled>--------</option>
<option style="color : #5050aa" disabled>Feed actions:</option>
- <option>&nbsp;&nbsp;Add new feed</option>
- <option>&nbsp;&nbsp;Remove this feed</option>
+ <option id="qmcAddFeed">&nbsp;&nbsp;Add new feed</option>
+ <option id="qmcRemoveFeed">&nbsp;&nbsp;Remove this feed</option>
<!-- <option>Edit this feed</option> -->
<option disabled>--------</option>
<option style="color : #5050aa" disabled>All feeds:</option>
- <option>&nbsp;&nbsp;Update</option>
- <option>&nbsp;&nbsp;Mark as read</option>
- <option>&nbsp;&nbsp;Toggle display read</option>
+ <option id="qmcUpdateFeeds">&nbsp;&nbsp;Update</option>
+ <option id="qmcCatchupAll">&nbsp;&nbsp;Mark as read</option>
+ <option id="qmcShowOnlyUnread">&nbsp;&nbsp;Show only unread</option>
</select>
<input type="submit" class="button" onclick="quickMenuGo()" value="Go">
</td>