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

Merge branch 'hotkeys-focus' of suraia/tt-rss into master

This commit is contained in:
fox 2019-04-14 14:15:13 +00:00 committed by Gogs
parent a2be311f52 e38fcd6dea
commit 525298569e
15 changed files with 119 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/article.php
View File

@ -534,7 +534,7 @@ class Article extends Handler_Protected {
$rv .= "<br clear='both'/>"; $rv .= "<br clear='both'/>";
} }
$rv .= "<div class=\"attachments\" dojoType=\"dijit.form.DropDownButton\">". $rv .= "<div class=\"attachments\" dojoType=\"fox.form.DropDownButton\">".
"<span>" . __('Attachments')."</span>"; "<span>" . __('Attachments')."</span>";
$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; $rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";

8
classes/feeds.php
View File

@ -54,7 +54,7 @@ class Feeds extends Handler_Protected {
$reply .= "<span class=\"right\">"; $reply .= "<span class=\"right\">";
$reply .= "<span id='selected_prompt'></span>"; $reply .= "<span id='selected_prompt'></span>";
$reply .= "&nbsp;"; $reply .= "&nbsp;";
$reply .= "<select dojoType=\"dijit.form.Select\" $reply .= "<select dojoType=\"fox.form.Select\"
onchange=\"Headlines.onActionChanged(this)\">"; onchange=\"Headlines.onActionChanged(this)\">";
$reply .= "<option value=\"0\" disabled='1'>".__('Select...')."</option>"; $reply .= "<option value=\"0\" disabled='1'>".__('Select...')."</option>";
@ -659,7 +659,7 @@ class Feeds extends Handler_Protected {
if (get_pref('ENABLE_FEED_CATS')) { if (get_pref('ENABLE_FEED_CATS')) {
print "<label class='inline'>" . __('Place in category:') . "</label> "; print "<label class='inline'>" . __('Place in category:') . "</label> ";
print_feed_cat_select("cat", false, 'dojoType="dijit.form.Select"'); print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
} }
print "</fieldset>"; print "</fieldset>";
@ -671,7 +671,7 @@ class Feeds extends Handler_Protected {
<section> <section>
<fieldset> <fieldset>
<select id="feedDlg_feedContainerSelect" <select id="feedDlg_feedContainerSelect"
dojoType="dijit.form.Select" size="3"> dojoType="fox.form.Select" size="3">
<script type="dojo/method" event="onChange" args="value"> <script type="dojo/method" event="onChange" args="value">
dijit.byId("feedDlg_feedUrl").attr("value", value); dijit.byId("feedDlg_feedUrl").attr("value", value);
</script> </script>
@ -734,7 +734,7 @@ class Feeds extends Handler_Protected {
print "<fieldset>"; print "<fieldset>";
print "<label class='inline'>" . __("Language:") . "</label>"; print "<label class='inline'>" . __("Language:") . "</label>";
print_select("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(), print_select("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(),
"dojoType='dijit.form.Select' title=\"".__('Used for word stemming')."\""); "dojoType='fox.form.Select' title=\"".__('Used for word stemming')."\"");
print "</fieldset>"; print "</fieldset>";
} }

34
classes/pref/feeds.php
View File

@ -571,7 +571,7 @@ class Pref_Feeds extends Handler_Protected {
print "<label>" . __('Place in category:') . "</label> "; print "<label>" . __('Place in category:') . "</label> ";
print_feed_cat_select("cat_id", $cat_id, print_feed_cat_select("cat_id", $cat_id,
'dojoType="dijit.form.Select"'); 'dojoType="fox.form.Select"');
print "</fieldset>"; print "</fieldset>";
} }
@ -602,7 +602,7 @@ class Pref_Feeds extends Handler_Protected {
print "<label>" . __('Language:') . "</label> "; print "<label>" . __('Language:') . "</label> ";
print_select("feed_language", $feed_language, $this::get_ts_languages(), print_select("feed_language", $feed_language, $this::get_ts_languages(),
'dojoType="dijit.form.Select"'); 'dojoType="fox.form.Select"');
print "</fieldset>"; print "</fieldset>";
} }
@ -621,7 +621,7 @@ class Pref_Feeds extends Handler_Protected {
print "<label>".__("Interval:")."</label> "; print "<label>".__("Interval:")."</label> ";
print_select_hash("update_interval", $update_interval, $update_intervals, print_select_hash("update_interval", $update_interval, $update_intervals,
'dojoType="dijit.form.Select"'); 'dojoType="fox.form.Select"');
print "</fieldset>"; print "</fieldset>";
@ -634,7 +634,7 @@ class Pref_Feeds extends Handler_Protected {
print "<label>" . __('Article purging:') . "</label> "; print "<label>" . __('Article purging:') . "</label> ";
print_select_hash("purge_interval", $purge_interval, $purge_intervals, print_select_hash("purge_interval", $purge_interval, $purge_intervals,
'dojoType="dijit.form.Select" ' . 'dojoType="fox.form.Select" ' .
((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"')); ((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
print "</fieldset>"; print "</fieldset>";
@ -826,7 +826,7 @@ class Pref_Feeds extends Handler_Protected {
print "<label>" . __('Place in category:') . "</label> "; print "<label>" . __('Place in category:') . "</label> ";
print_feed_cat_select("cat_id", false, print_feed_cat_select("cat_id", false,
'disabled="1" dojoType="dijit.form.Select"'); 'disabled="1" dojoType="fox.form.Select"');
$this->batch_edit_cbox("cat_id"); $this->batch_edit_cbox("cat_id");
@ -840,7 +840,7 @@ class Pref_Feeds extends Handler_Protected {
print "<label>" . __('Language:') . "</label> "; print "<label>" . __('Language:') . "</label> ";
print_select("feed_language", "", $this::get_ts_languages(), print_select("feed_language", "", $this::get_ts_languages(),
'disabled="1" dojoType="dijit.form.Select"'); 'disabled="1" dojoType="fox.form.Select"');
$this->batch_edit_cbox("feed_language"); $this->batch_edit_cbox("feed_language");
@ -859,7 +859,7 @@ class Pref_Feeds extends Handler_Protected {
print "<label>".__("Interval:")."</label> "; print "<label>".__("Interval:")."</label> ";
print_select_hash("update_interval", "", $update_intervals, print_select_hash("update_interval", "", $update_intervals,
'disabled="1" dojoType="dijit.form.Select"'); 'disabled="1" dojoType="fox.form.Select"');
$this->batch_edit_cbox("update_interval"); $this->batch_edit_cbox("update_interval");
@ -874,7 +874,7 @@ class Pref_Feeds extends Handler_Protected {
print "<label>" . __('Article purging:') . "</label> "; print "<label>" . __('Article purging:') . "</label> ";
print_select_hash("purge_interval", "", $purge_intervals, print_select_hash("purge_interval", "", $purge_intervals,
'disabled="1" dojoType="dijit.form.Select"'); 'disabled="1" dojoType="fox.form.Select"');
$this->batch_edit_cbox("purge_interval"); $this->batch_edit_cbox("purge_interval");
@ -1208,7 +1208,7 @@ class Pref_Feeds extends Handler_Protected {
print '<div dojoType="dijit.layout.BorderContainer" gutters="false">'; print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
print "<div region='top' dojoType=\"dijit.Toolbar\">"; #toolbar print "<div region='top' dojoType=\"fox.Toolbar\">"; #toolbar
print "<div style='float : right; padding-right : 4px;'> print "<div style='float : right; padding-right : 4px;'>
<input dojoType=\"dijit.form.TextBox\" id=\"feed_search\" size=\"20\" type=\"search\" <input dojoType=\"dijit.form.TextBox\" id=\"feed_search\" size=\"20\" type=\"search\"
@ -1217,7 +1217,7 @@ class Pref_Feeds extends Handler_Protected {
__('Search')."</button> __('Search')."</button>
</div>"; </div>";
print "<div dojoType=\"dijit.form.DropDownButton\">". print "<div dojoType=\"fox.form.DropDownButton\">".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\" print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
@ -1226,7 +1226,7 @@ class Pref_Feeds extends Handler_Protected {
dojoType=\"dijit.MenuItem\">".__('None')."</div>"; dojoType=\"dijit.MenuItem\">".__('None')."</div>";
print "</div></div>"; print "</div></div>";
print "<div dojoType=\"dijit.form.DropDownButton\">". print "<div dojoType=\"fox.form.DropDownButton\">".
"<span>" . __('Feeds')."</span>"; "<span>" . __('Feeds')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
print "<div onclick=\"CommonDialogs.quickAddFeed()\" print "<div onclick=\"CommonDialogs.quickAddFeed()\"
@ -1242,7 +1242,7 @@ class Pref_Feeds extends Handler_Protected {
print "</div></div>"; print "</div></div>";
if (get_pref('ENABLE_FEED_CATS')) { if (get_pref('ENABLE_FEED_CATS')) {
print "<div dojoType=\"dijit.form.DropDownButton\">". print "<div dojoType=\"fox.form.DropDownButton\">".
"<span>" . __('Categories')."</span>"; "<span>" . __('Categories')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
print "<div onclick=\"dijit.byId('feedTree').createCategory()\" print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
@ -1449,8 +1449,8 @@ class Pref_Feeds extends Handler_Protected {
ORDER BY last_article"); ORDER BY last_article");
$sth->execute([$_SESSION['uid']]); $sth->execute([$_SESSION['uid']]);
print "<div dojoType='dijit.Toolbar'>"; print "<div dojoType='fox.Toolbar'>";
print "<div dojoType='dijit.form.DropDownButton'>". print "<div dojoType='fox.form.DropDownButton'>".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType='dijit.Menu' style='display: none'>"; print "<div dojoType='dijit.Menu' style='display: none'>";
print "<div onclick=\"Tables.select('inactive-feeds-list', true)\" print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
@ -1506,8 +1506,8 @@ class Pref_Feeds extends Handler_Protected {
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?"); FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
$sth->execute([$_SESSION['uid']]); $sth->execute([$_SESSION['uid']]);
print "<div dojoType=\"dijit.Toolbar\">"; print "<div dojoType=\"fox.Toolbar\">";
print "<div dojoType=\"dijit.form.DropDownButton\">". print "<div dojoType=\"fox.form.DropDownButton\">".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
print "<div onclick=\"Tables.select('error-feeds-list', true)\" print "<div onclick=\"Tables.select('error-feeds-list', true)\"
@ -1662,7 +1662,7 @@ class Pref_Feeds extends Handler_Protected {
if (get_pref('ENABLE_FEED_CATS')) { if (get_pref('ENABLE_FEED_CATS')) {
print "<fieldset>"; print "<fieldset>";
print "<label>" . __('Place in category:') . "</label> "; print "<label>" . __('Place in category:') . "</label> ";
print_feed_cat_select("cat", false, 'dojoType="dijit.form.Select"'); print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
print "</fieldset>"; print "</fieldset>";
} }

28
classes/pref/filters.php
View File

@ -354,9 +354,9 @@ class Pref_Filters extends Handler_Protected {
print "<header class='horizontal'>".__("Match")."</header>"; print "<header class='horizontal'>".__("Match")."</header>";
print "<section>"; print "<section>";
print "<div dojoType=\"dijit.Toolbar\">"; print "<div dojoType=\"fox.Toolbar\">";
print "<div dojoType=\"dijit.form.DropDownButton\">". print "<div dojoType=\"fox.form.DropDownButton\">".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(true)\" print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(true)\"
@ -414,9 +414,9 @@ class Pref_Filters extends Handler_Protected {
print "<section>"; print "<section>";
print "<div dojoType=\"dijit.Toolbar\">"; print "<div dojoType=\"fox.Toolbar\">";
print "<div dojoType=\"dijit.form.DropDownButton\">". print "<div dojoType=\"fox.form.DropDownButton\">".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(true)\" print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(true)\"
@ -757,7 +757,7 @@ class Pref_Filters extends Handler_Protected {
print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
print "<div dojoType='dijit.Toolbar'>"; print "<div dojoType='fox.Toolbar'>";
if (array_key_exists("search", $_REQUEST)) { if (array_key_exists("search", $_REQUEST)) {
$_SESSION["prefs_filter_search"] = $filter_search; $_SESSION["prefs_filter_search"] = $filter_search;
@ -772,7 +772,7 @@ class Pref_Filters extends Handler_Protected {
__('Search')."</button> __('Search')."</button>
</div>"; </div>";
print "<div dojoType=\"dijit.form.DropDownButton\">". print "<div dojoType=\"fox.form.DropDownButton\">".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
print "<div onclick=\"dijit.byId('filterTree').model.setAllChecked(true)\" print "<div onclick=\"dijit.byId('filterTree').model.setAllChecked(true)\"
@ -856,9 +856,9 @@ class Pref_Filters extends Handler_Protected {
print "<header class='horizontal'>".__("Match")."</header >"; print "<header class='horizontal'>".__("Match")."</header >";
print "<section>"; print "<section>";
print "<div dojoType='dijit.Toolbar'>"; print "<div dojoType='fox.Toolbar'>";
print "<div dojoType='dijit.form.DropDownButton'>". print "<div dojoType='fox.form.DropDownButton'>".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType='dijit.Menu' style='display: none'>"; print "<div dojoType='dijit.Menu' style='display: none'>";
print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(true)\" print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(true)\"
@ -885,9 +885,9 @@ class Pref_Filters extends Handler_Protected {
print "<section>"; print "<section>";
print "<div dojoType='dijit.Toolbar'>"; print "<div dojoType='fox.Toolbar'>";
print "<div dojoType='dijit.form.DropDownButton'>". print "<div dojoType='fox.form.DropDownButton'>".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType='dijit.Menu' style='display: none'>"; print "<div dojoType='dijit.Menu' style='display: none'>";
print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(true)\" print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(true)\"
@ -993,7 +993,7 @@ class Pref_Filters extends Handler_Protected {
print "<fieldset>"; print "<fieldset>";
print "<label style='display : inline'>". __("on field") . "</label> "; print "<label style='display : inline'>". __("on field") . "</label> ";
print_select_hash("filter_type", $filter_type, $filter_types, print_select_hash("filter_type", $filter_type, $filter_types,
'dojoType="dijit.form.Select"'); 'dojoType="fox.form.Select"');
print "<label style='padding-left : 10px; display : inline'>" . __("in") . "</label> "; print "<label style='padding-left : 10px; display : inline'>" . __("in") . "</label> ";
print "</fieldset>"; print "</fieldset>";
@ -1042,7 +1042,7 @@ class Pref_Filters extends Handler_Protected {
print "<section>"; print "<section>";
print "<select name='action_id' dojoType='dijit.form.Select' print "<select name='action_id' dojoType='fox.form.Select'
onchange='Filters.filterDlgCheckAction(this)'>"; onchange='Filters.filterDlgCheckAction(this)'>";
$res = $this->pdo->query("SELECT id,description FROM ttrss_filter_actions $res = $this->pdo->query("SELECT id,description FROM ttrss_filter_actions
@ -1073,7 +1073,7 @@ class Pref_Filters extends Handler_Protected {
print_label_select("action_param_label", $action_param, print_label_select("action_param_label", $action_param,
"id='filterDlg_actionParamLabel' style=\"$label_param_hidden\" "id='filterDlg_actionParamLabel' style=\"$label_param_hidden\"
dojoType='dijit.form.Select'"); dojoType='fox.form.Select'");
$filter_actions = PluginHost::getInstance()->get_filter_actions(); $filter_actions = PluginHost::getInstance()->get_filter_actions();
$filter_action_hash = array(); $filter_action_hash = array();
@ -1096,7 +1096,7 @@ class Pref_Filters extends Handler_Protected {
} }
print_select_hash("filterDlg_actionParamPlugin", $action_param, $filter_action_hash, print_select_hash("filterDlg_actionParamPlugin", $action_param, $filter_action_hash,
"style=\"$plugin_param_hidden\" dojoType='dijit.form.Select' $filter_plugin_disabled", "style=\"$plugin_param_hidden\" dojoType='fox.form.Select' $filter_plugin_disabled",
"action_param_plugin"); "action_param_plugin");
print "</span>"; print "</span>";

4
classes/pref/labels.php
View File

@ -251,9 +251,9 @@ class Pref_Labels extends Handler_Protected {
print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
print "<div dojoType='dijit.Toolbar'>"; print "<div dojoType='fox.Toolbar'>";
print "<div dojoType='dijit.form.DropDownButton'>". print "<div dojoType='fox.form.DropDownButton'>".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">"; print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\" print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\"

14
classes/pref/prefs.php
View File

@ -579,7 +579,7 @@ class Pref_Prefs extends Handler_Protected {
if ($pref_name == "USER_LANGUAGE") { if ($pref_name == "USER_LANGUAGE") {
print_select_hash($pref_name, $value, get_translations(), print_select_hash($pref_name, $value, get_translations(),
"style='width : 220px; margin : 0px' dojoType='dijit.form.Select'"); "style='width : 220px; margin : 0px' dojoType='fox.form.Select'");
} else if ($pref_name == "USER_TIMEZONE") { } else if ($pref_name == "USER_TIMEZONE") {
@ -595,7 +595,7 @@ class Pref_Prefs extends Handler_Protected {
if (!theme_exists($value)) $value = "default.php"; if (!theme_exists($value)) $value = "default.php";
print "<select name='$pref_name' id='$pref_name' dojoType='dijit.form.Select'>"; print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>";
$issel = $value == "default.php" ? "selected='selected'" : ""; $issel = $value == "default.php" ? "selected='selected'" : "";
print "<option $issel value='default.php'>".__("default")."</option>"; print "<option $issel value='default.php'>".__("default")."</option>";
@ -618,11 +618,11 @@ class Pref_Prefs extends Handler_Protected {
global $update_intervals_nodefault; global $update_intervals_nodefault;
print_select_hash($pref_name, $value, $update_intervals_nodefault, print_select_hash($pref_name, $value, $update_intervals_nodefault,
'dojoType="dijit.form.Select"'); 'dojoType="fox.form.Select"');
} else if ($pref_name == "DEFAULT_SEARCH_LANGUAGE") { } else if ($pref_name == "DEFAULT_SEARCH_LANGUAGE") {
print_select($pref_name, $value, Pref_Feeds::get_ts_languages(), print_select($pref_name, $value, Pref_Feeds::get_ts_languages(),
'dojoType="dijit.form.Select"'); 'dojoType="fox.form.Select"');
} else if ($type_name == "bool") { } else if ($type_name == "bool") {
@ -715,7 +715,7 @@ class Pref_Prefs extends Handler_Protected {
print_hidden("op", "pref-prefs"); print_hidden("op", "pref-prefs");
print_hidden("method", "saveconfig"); print_hidden("method", "saveconfig");
print "<div dojoType=\"dijit.form.ComboButton\" type=\"submit\" class=\"alt-primary\"> print "<div dojoType=\"fox.form.ComboButton\" type=\"submit\" class=\"alt-primary\">
<span>".__('Save configuration')."</span> <span>".__('Save configuration')."</span>
<div dojoType=\"dijit.DropDownMenu\"> <div dojoType=\"dijit.DropDownMenu\">
<div dojoType=\"dijit.MenuItem\" <div dojoType=\"dijit.MenuItem\"
@ -1021,9 +1021,9 @@ class Pref_Prefs extends Handler_Protected {
} }
function editPrefProfiles() { function editPrefProfiles() {
print "<div dojoType='dijit.Toolbar'>"; print "<div dojoType='fox.Toolbar'>";
print "<div dojoType='dijit.form.DropDownButton'>". print "<div dojoType='fox.form.DropDownButton'>".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType='dijit.Menu' style='display: none'>"; print "<div dojoType='dijit.Menu' style='display: none'>";
print "<div onclick=\"Tables.select('pref-profiles-list', true)\" print "<div onclick=\"Tables.select('pref-profiles-list', true)\"

8
classes/pref/users.php
View File

@ -69,10 +69,10 @@ class Pref_Users extends Handler_Protected {
if (!$sel_disabled) { if (!$sel_disabled) {
print_select_hash("access_level", $access_level, $access_level_names, print_select_hash("access_level", $access_level, $access_level_names,
"dojoType=\"dijit.form.Select\" $sel_disabled"); "dojoType=\"fox.form.Select\" $sel_disabled");
} else { } else {
print_select_hash("", $access_level, $access_level_names, print_select_hash("", $access_level, $access_level_names,
"dojoType=\"dijit.form.Select\" $sel_disabled"); "dojoType=\"fox.form.Select\" $sel_disabled");
print_hidden("access_level", "$access_level"); print_hidden("access_level", "$access_level");
} }
@ -313,7 +313,7 @@ class Pref_Users extends Handler_Protected {
print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>"; print "<div dojoType='dijit.layout.BorderContainer' gutters='false'>";
print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>"; print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>";
print "<div dojoType='dijit.Toolbar'>"; print "<div dojoType='fox.Toolbar'>";
$user_search = trim(clean($_REQUEST["search"])); $user_search = trim(clean($_REQUEST["search"]));
@ -336,7 +336,7 @@ class Pref_Users extends Handler_Protected {
$sort = "login"; $sort = "login";
} }
print "<div dojoType='dijit.form.DropDownButton'>". print "<div dojoType='fox.form.DropDownButton'>".
"<span>" . __('Select')."</span>"; "<span>" . __('Select')."</span>";
print "<div dojoType='dijit.Menu' style='display: none'>"; print "<div dojoType='dijit.Menu' style='display: none'>";
print "<div onclick=\"Tables.select('prefUserList', true)\" print "<div onclick=\"Tables.select('prefUserList', true)\"

10
index.php
View File

@ -145,7 +145,7 @@
<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"> <div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap">
<div id="toolbar-frame" dojoType="dijit.layout.ContentPane" region="top"> <div id="toolbar-frame" dojoType="dijit.layout.ContentPane" region="top">
<div id="toolbar" dojoType="dijit.Toolbar"> <div id="toolbar" dojoType="fox.Toolbar">
<i class="material-icons net-alert" style="display : none" <i class="material-icons net-alert" style="display : none"
title="<?php echo __("Communication problem with server.") ?>">error_outline</i> title="<?php echo __("Communication problem with server.") ?>">error_outline</i>
@ -170,7 +170,7 @@
<select name="view_mode" title="<?php echo __('Show articles') ?>" <select name="view_mode" title="<?php echo __('Show articles') ?>"
onchange="App.onViewModeChanged()" onchange="App.onViewModeChanged()"
dojoType="dijit.form.Select"> dojoType="fox.form.Select">
<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option> <option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
<option value="all_articles"><?php echo __('All Articles') ?></option> <option value="all_articles"><?php echo __('All Articles') ?></option>
<option value="marked"><?php echo __('Starred') ?></option> <option value="marked"><?php echo __('Starred') ?></option>
@ -182,7 +182,7 @@
<select title="<?php echo __('Sort articles') ?>" <select title="<?php echo __('Sort articles') ?>"
onchange="App.onViewModeChanged()" onchange="App.onViewModeChanged()"
dojoType="dijit.form.Select" name="order_by"> dojoType="fox.form.Select" name="order_by">
<option selected="selected" value="default"><?php echo __('Default') ?></option> <option selected="selected" value="default"><?php echo __('Default') ?></option>
<option value="feed_dates"><?php echo __('Newest first') ?></option> <option value="feed_dates"><?php echo __('Newest first') ?></option>
@ -190,7 +190,7 @@
<option value="title"><?php echo __('Title') ?></option> <option value="title"><?php echo __('Title') ?></option>
</select> </select>
<div dojoType="dijit.form.ComboButton" onclick="Feeds.catchupCurrent()"> <div dojoType="fox.form.ComboButton" onclick="Feeds.catchupCurrent()">
<span><?php echo __('Mark as read') ?></span> <span><?php echo __('Mark as read') ?></span>
<div dojoType="dijit.DropDownMenu"> <div dojoType="dijit.DropDownMenu">
<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')"> <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')">
@ -215,7 +215,7 @@
} }
?> ?>
<div dojoType="dijit.form.DropDownButton" class="action-button" title="<?php echo __('Actions...') ?>"> <div dojoType="fox.form.DropDownButton" class="action-button" title="<?php echo __('Actions...') ?>">
<span><i class="material-icons">menu</i></span> <span><i class="material-icons">menu</i></span>
<div dojoType="dijit.Menu" style="display: none"> <div dojoType="dijit.Menu" style="display: none">
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?php echo __('Preferences...') ?></div> <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?php echo __('Preferences...') ?></div>

5
js/FeedTree.js
View File

@ -2,7 +2,10 @@
define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"], function (declare, domConstruct) { define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"], function (declare, domConstruct) {
return declare("fox.FeedTree", dijit.Tree, { return declare("fox.FeedTree", dijit.Tree, {
_onKeyPress: function(/* Event */ e) { _onContainerKeydown: function(/* Event */ e) {
return; // Stop dijit.Tree from interpreting keystrokes
},
_onContainerKeypress: function(/* Event */ e) {
return; // Stop dijit.Tree from interpreting keystrokes return; // Stop dijit.Tree from interpreting keystrokes
}, },
_createTreeNode: function(args) { _createTreeNode: function(args) {

14
js/Toolbar.js Executable file
View File

@ -0,0 +1,14 @@
/* global dijit */
define(["dojo/_base/declare", "dijit/Toolbar"], function (declare) {
return declare("fox.Toolbar", dijit.Toolbar, {
_onContainerKeydown: function(/* Event */ e) {
return; // Stop dijit.Toolbar from interpreting keystrokes
},
_onContainerKeypress: function(/* Event */ e) {
return; // Stop dijit.Toolbar from interpreting keystrokes
},
focus: function() {
return; // Stop dijit.Toolbar from focusing the first child on click
},
});
});

12
js/form/ComboButton.js Executable file
View File

@ -0,0 +1,12 @@
/* global dijit */
define(["dojo/_base/declare", "dijit/form/ComboButton"], function (declare) {
return declare("fox.form.ComboButton", dijit.form.ComboButton, {
startup: function() {
this.inherited(arguments);
this.dropDown.autoFocus = true; // Allow dropdown menu to be focused on click
},
focus: function() {
return; // Stop dijit.form.ComboButton from keeping focus after closing the menu
},
});
});

12
js/form/DropDownButton.js Executable file
View File

@ -0,0 +1,12 @@
/* global dijit */
define(["dojo/_base/declare", "dijit/form/DropDownButton"], function (declare) {
return declare("fox.form.DropDownButton", dijit.form.DropDownButton, {
startup: function() {
this.inherited(arguments);
this.dropDown.autoFocus = true; // Allow dropdown menu to be focused on click
},
focus: function() {
return; // Stop dijit.form.DropDownButton from keeping focus after closing the menu
},
});
});

8
js/form/Select.js Executable file
View File

@ -0,0 +1,8 @@
/* global dijit */
define(["dojo/_base/declare", "dijit/form/Select"], function (declare) {
return declare("fox.form.Select", dijit.form.Select, {
focus: function() {
return; // Stop dijit.form.Select from keeping focus after closing the menu
},
});
});

10
js/prefs.js
View File

@ -53,7 +53,11 @@ require(["dojo/_base/kernel",
"fox/PrefFilterStore", "fox/PrefFilterStore",
"fox/PrefFeedTree", "fox/PrefFeedTree",
"fox/PrefFilterTree", "fox/PrefFilterTree",
"fox/PrefLabelTree"], function (dojo, declare, ready, parser, AppBase) { "fox/PrefLabelTree",
"fox/Toolbar",
"fox/form/Select",
"fox/form/ComboButton",
"fox/form/DropDownButton"], function (dojo, declare, ready, parser, AppBase) {
ready(function () { ready(function () {
try { try {
@ -118,6 +122,10 @@ require(["dojo/_base/kernel",
hotkeyHandler: function (event) { hotkeyHandler: function (event) {
if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return; if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
// Arrow buttons and escape are not reported via keypress, handle them via keydown.
// escape = 27, left = 37, up = 38, right = 39, down = 40
if (event.type == "keydown" && event.which != 27 && (event.which < 37 || event.which > 40)) return;
const action_name = App.keyeventToAction(event); const action_name = App.keyeventToAction(event);
if (action_name) { if (action_name) {

8
js/tt-rss.js
View File

@ -54,7 +54,11 @@ require(["dojo/_base/kernel",
"fox/Headlines", "fox/Headlines",
"fox/Article", "fox/Article",
"fox/FeedStoreModel", "fox/FeedStoreModel",
"fox/FeedTree"], function (dojo, declare, ready, parser, AppBase) { "fox/FeedTree",
"fox/Toolbar",
"fox/form/Select",
"fox/form/ComboButton",
"fox/form/DropDownButton"], function (dojo, declare, ready, parser, AppBase) {
ready(function () { ready(function () {
try { try {
@ -203,7 +207,7 @@ require(["dojo/_base/kernel",
isCombinedMode: function() { isCombinedMode: function() {
return App.getInitParam("combined_display_mode"); return App.getInitParam("combined_display_mode");
}, },
hotkeyHandler(event) { hotkeyHandler: function(event) {
if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return; if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
// Arrow buttons and escape are not reported via keypress, handle them via keydown. // Arrow buttons and escape are not reported via keypress, handle them via keydown.