public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-26 18:52:35 +00:00
Code Issues Releases Wiki Activity

rename main toolbar elements to be more consistent

Browse Source
This commit is contained in:
Andrew Dolgov
2018-12-05 10:03:58 +03:00
parent d967d43319
commit 05200a3840
9 changed files with 160 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/Feeds.js
View File

@@ -319,10 +319,10 @@ define(["dojo/_base/declare"], function (declare) {
}, 10 * 1000);
}
Form.enable("main_toolbar_form");
Form.enable("toolbar-main");
let query = Object.assign({op: "feeds", method: "view", feed: feed},
dojo.formToObject("main_toolbar_form"));
dojo.formToObject("toolbar-main"));
if (method) query.m = method;
@@ -347,7 +347,7 @@ define(["dojo/_base/declare"], function (declare) {
query.m = "ForceUpdate";
}
Form.enable("main_toolbar_form");
Form.enable("toolbar-main");
if (!delayed)
if (!this.setExpando(feed, is_cat,

6
js/Headlines.js
View File

@@ -46,7 +46,7 @@ define(["dojo/_base/declare"], function (declare) {
}
},
loadMore: function () {
const view_mode = document.forms["main_toolbar_form"].view_mode.value;
const view_mode = document.forms["toolbar-main"].view_mode.value;
const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
const num_all = $$("#headlines-frame > div[id*=RROW]").length;
const num_unread = Feeds.getUnread(Feeds.getActive(), Feeds.activeIsCat());
@@ -270,7 +270,7 @@ define(["dojo/_base/declare"], function (declare) {
if (offset == 0) {
this.loaded_article_ids = [];
dojo.html.set($("headlines-toolbar"),
dojo.html.set($("toolbar-headlines"),
reply['headlines']['toolbar'],
{parseContent: true});
@@ -389,7 +389,7 @@ define(["dojo/_base/declare"], function (declare) {
Notify.close();
},
reverse: function () {
const toolbar = document.forms["main_toolbar_form"];
const toolbar = document.forms["toolbar-main"];
const order_by = dijit.getEnclosingWidget(toolbar.order_by);
let value = order_by.attr('value');

2
js/tt-rss.js
View File

@@ -121,7 +121,7 @@ require(["dojo/_base/kernel",
Cookie.delete("ttrss_test");
const toolbar = document.forms["main_toolbar_form"];
const toolbar = document.forms["toolbar-main"];
dijit.getEnclosingWidget(toolbar.view_mode).attr('value',
App.getInitParam("default_view_mode"));