From 0518510814ffaca80d277bdf1a20fc3b44271f65 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 4 Dec 2017 11:02:13 +0300 Subject: [PATCH] remove some obsolete stuff, fix minor issues found by code analyzer --- js/deprecated.js | 23 ---------------- js/functions.js | 72 ++---------------------------------------------- js/prefs.js | 10 +++---- js/tt-rss.js | 5 ---- 4 files changed, 8 insertions(+), 102 deletions(-) delete mode 100644 js/deprecated.js diff --git a/js/deprecated.js b/js/deprecated.js deleted file mode 100644 index dd286aa7..00000000 --- a/js/deprecated.js +++ /dev/null @@ -1,23 +0,0 @@ -function selectTableRow(r, do_select) { - - if (do_select) { - r.addClassName("Selected"); - } else { - r.removeClassName("Selected"); - } -} - -function selectTableRowById(elem_id, check_id, do_select) { - var row = $(elem_id); - - if (row) { - selectTableRow(row, do_select); - } - - var check = $(check_id); - - if (check) { - check.checked = do_select; - } -} - diff --git a/js/functions.js b/js/functions.js index d52fee89..4c5d67f6 100755 --- a/js/functions.js +++ b/js/functions.js @@ -96,17 +96,7 @@ function exception_error(e, e_compat, filename, lineno, colno) { } function param_escape(arg) { - if (typeof encodeURIComponent != 'undefined') - return encodeURIComponent(arg); - else - return escape(arg); -} - -function param_unescape(arg) { - if (typeof decodeURIComponent != 'undefined') - return decodeURIComponent(arg); - else - return unescape(arg); + return encodeURIComponent(arg); } function notify_real(msg, no_hide, n_type) { @@ -255,50 +245,11 @@ function gotoMain() { document.location.href = "index.php"; } -/** * @(#)isNumeric.js * * Copyright (c) 2000 by Sundar Dorai-Raj - * * @author Sundar Dorai-Raj - * * Email: sdoraira@vt.edu - * * This program is free software; you can redistribute it and/or - * * modify it under the terms of the GNU General Public License - * * as published by the Free Software Foundation; either version 2 - * * of the License, or (at your option) any later version, - * * provided that any use properly credits the author. - * * This program is distributed in the hope that it will be useful, - * * but WITHOUT ANY WARRANTY; without even the implied warranty of - * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * * GNU General Public License for more details at http://www.gnu.org * * */ - - var numbers=".0123456789"; - function isNumeric(x) { - // is x a String or a character? - if(x.length>1) { - // remove negative sign - x=Math.abs(x)+""; - for(var j=0;j=0) return true; - return false; - } - } - - function toggleSelectRowById(sender, id) { var row = $(id); return toggleSelectRow(sender, row); } -function toggleSelectListRow(sender) { - var row = sender.parentNode; - return toggleSelectRow(sender, row); -} - /* this is for dijit Checkbox */ function toggleSelectListRow2(sender) { var row = sender.domNode.parentNode; @@ -345,20 +296,11 @@ function checkboxToggleElement(elem, id) { } } -function dropboxSelect(e, v) { - for (var i = 0; i < e.length; i++) { - if (e[i].value == v) { - e.selectedIndex = i; - break; - } - } -} - function getURLParam(param){ return String(window.location.href).parseQuery()[param]; } -function closeInfoBox(cleanup) { +function closeInfoBox() { dialog = dijit.byId("infoBox"); if (dialog) dialog.hide(); @@ -530,13 +472,6 @@ function strip_tags(s) { return s.replace(/<\/?[^>]+(>|$)/g, ""); } -function truncate_string(s, length) { - if (!length) length = 30; - var tmp = s.substring(0, length); - if (s.length > length) tmp += "…"; - return tmp; -} - function hotkey_prefix_timeout() { var date = new Date(); @@ -739,7 +674,6 @@ function quickAddFeed() { dialog.show_error(__("XML validation failed: %s"). replace("%s", rc['message'])); break; - break; case 0: dialog.show_error(__("You are already subscribed to this feed.")); break; @@ -1308,7 +1242,7 @@ function getSelectedTableRowIds(id) { return rows; } -function editFeed(feed, event) { +function editFeed(feed) { if (feed <= 0) return alert(__("You can't edit this kind of feed.")); diff --git a/js/prefs.js b/js/prefs.js index 0512e0e3..a3f32dcb 100755 --- a/js/prefs.js +++ b/js/prefs.js @@ -9,7 +9,7 @@ function notify_callback2(transport, sticky) { notify_info(transport.responseText, sticky); } -function updateFeedList(sort_key) { +function updateFeedList() { var user_search = $("feed_search"); var search = ""; @@ -83,7 +83,7 @@ function addUser() { } -function editUser(id, event) { +function editUser(id) { var query = "backend.php?op=pref-users&method=edit&id=" + param_escape(id); @@ -749,7 +749,7 @@ function updateSystemList() { } }); } -function selectTab(id, noupdate, method) { +function selectTab(id, noupdate) { if (!noupdate) { notify_progress("Loading, please wait..."); @@ -1319,7 +1319,7 @@ function resetCatOrder() { }); } -function editCat(id, item, event) { +function editCat(id, item) { var new_name = prompt(__('Rename category to:'), item.name); if (new_name && new_name != item.name) { @@ -1340,7 +1340,7 @@ function editCat(id, item, event) { } } -function editLabel(id, event) { +function editLabel(id) { var query = "backend.php?op=pref-labels&method=edit&id=" + param_escape(id); diff --git a/js/tt-rss.js b/js/tt-rss.js index b498b5e9..4df1b04e 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -365,7 +365,6 @@ function init_hotkey_actions() { hotkey_actions["open_in_new_window"] = function() { if (getActiveArticleId()) { openArticleInNewWindow(getActiveArticleId()); - return; } }; hotkey_actions["catchup_below"] = function() { @@ -375,13 +374,9 @@ function init_hotkey_actions() { catchupRelativeToArticle(0); }; hotkey_actions["article_scroll_down"] = function() { - var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame"); - scrollArticle(40); }; hotkey_actions["article_scroll_up"] = function() { - var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame"); - scrollArticle(-40); }; hotkey_actions["close_article"] = function() { -- 2.39.2