valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace catchupCurrentFeed dropdown with a better control

This commit is contained in:
Andrew Dolgov 2013-04-03 18:20:14 +04:00
parent 686852d548
commit e3ca32a818
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
index.php
View File

@ -187,15 +187,20 @@
<option value="date_reverse"><?php echo __('Oldest first') ?></option> <option value="date_reverse"><?php echo __('Oldest first') ?></option>
</select> </select>
<select title="<?php echo __('Mark feed as read') ?>" <div dojoType="dijit.form.ComboButton" onclick="catchupCurrentFeed()">
onchange="catchupCurrentFeed(this)" <span><?php echo __('Mark as read') ?></span>
dojoType="dijit.form.Select" name="catchup_feed"> <div dojoType="dijit.DropDownMenu">
<option selected="selected" value="default"><?php echo __('Mark as read') ?></option> <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1day')">
<option value="all"><?php echo __('All articles') ?></option> <?php echo __('Older than one day') ?>
<option value="1day"><?php echo __('Older than one day') ?></option> </div>
<option value="1week"><?php echo __('Older than one week') ?></option> <div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1week')">
<option value="2weeks"><?php echo __('Older than two weeks') ?></option> <?php echo __('Older than one week') ?>
</select> </div>
<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('2week')">
<?php echo __('Older than two weeks') ?>
</div>
</div>
</div>
</form> </form>

16
js/feedlist.js
View File

@ -380,20 +380,8 @@ function getNextUnreadFeed(feed, is_cat) {
} }
} }
function catchupCurrentFeed(elem) { function catchupCurrentFeed(mode) {
catchupFeed(getActiveFeedId(), activeFeedIsCat(), mode);
if (elem) {
var toolbar = document.forms["main_toolbar_form"];
var catchup_feed = dijit.getEnclosingWidget(toolbar.catchup_feed);
var mode = catchup_feed.attr('value');
if (mode != 'default') {
catchupFeed(getActiveFeedId(), activeFeedIsCat(), mode);
catchup_feed.attr('value', 'default');
}
} else {
catchupFeed(getActiveFeedId(), activeFeedIsCat());
}
} }
function catchupFeedInGroup(id) { function catchupFeedInGroup(id) {