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

fix create filter dialog when called from main UI, fix exception_error() parameter position errors

This commit is contained in:
Andrew Dolgov 2008-05-17 17:25:41 +01:00
parent dcbeb0e347
commit 438f2ce922
4 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feedlist.js
View File

@ -29,7 +29,7 @@ function viewNextFeedPage() {
undefined, _feed_cur_page+1); undefined, _feed_cur_page+1);
} catch (e) { } catch (e) {
exception_error(e, "viewFeedGoPage"); exception_error("viewFeedGoPage", e);
} }
} }

48
functions.js
View File

@ -1193,7 +1193,7 @@ function infobox_submit_callback2(transport) {
try { try {
// called from prefs, reload tab // called from prefs, reload tab
if (active_tab) { if (typeof active_tab != 'undefined' && active_tab) {
selectTab(active_tab, false); selectTab(active_tab, false);
} }
} catch (e) { } } catch (e) { }
@ -1249,25 +1249,33 @@ function infobox_callback2(transport) {
function createFilter() { function createFilter() {
var form = document.forms['filter_add_form']; try {
var reg_exp = form.reg_exp.value;
if (reg_exp == "") { var form = document.forms['filter_add_form'];
alert(__("Can't add filter: nothing to match on.")); var reg_exp = form.reg_exp.value;
return false;
}
var query = Form.serialize("filter_add_form");
// we can be called from some other tab in Prefs
if (active_tab) active_tab = "filterConfig";
new Ajax.Request("backend.php?" + query, {
onComplete: function (transport) {
infobox_submit_callback2(transport);
} });
return true; if (reg_exp == "") {
alert(__("Can't add filter: nothing to match on."));
return false;
}
var query = Form.serialize("filter_add_form");
// we can be called from some other tab in Prefs
if (typeof active_tab != 'undefined' && active_tab) {
active_tab = "filterConfig";
}
new Ajax.Request("backend.php?" + query, {
onComplete: function (transport) {
infobox_submit_callback2(transport);
} });
return true;
} catch (e) {
exception_error("createFilter", e);
}
} }
function toggleSubmitNotEmpty(e, submit_id) { function toggleSubmitNotEmpty(e, submit_id) {
@ -1459,7 +1467,7 @@ function filterDlgCheckAction(sender) {
} }
} catch (e) { } catch (e) {
exception_error(e, "filterDlgCheckAction"); exception_error("filterDlgCheckAction", e);
} }
} }
@ -1636,7 +1644,7 @@ function focus_element(id) {
var e = document.getElementById(id); var e = document.getElementById(id);
if (e) e.focus(); if (e) e.focus();
} catch (e) { } catch (e) {
exception_error(e, "focus_element"); exception_error("focus_element", e);
} }
return false; return false;
} }

6
tt-rss.js
View File

@ -785,7 +785,7 @@ function toggle_feedlist() {
// queue: { position: 'end', scope: 'FLFADEQ', limit: 1 }}); // queue: { position: 'end', scope: 'FLFADEQ', limit: 1 }});
} }
} catch (e) { } catch (e) {
exception_error(e, "toggle_feedlist"); exception_error("toggle_feedlist", e);
} }
} */ } */
@ -848,7 +848,7 @@ function collapse_feedlist() {
setCookie("ttrss_vf_fclps", "1"); setCookie("ttrss_vf_fclps", "1");
} }
} catch (e) { } catch (e) {
exception_error(e, "toggle_feedlist"); exception_error("toggle_feedlist", e);
} }
} }
@ -877,7 +877,7 @@ function adjustArticleScore(id, score) {
} }
} catch (e) { } catch (e) {
exception_error(e, "adjustArticleScore"); exception_error("adjustArticleScore", e);
} }
} }

18
viewfeed.js
View File

@ -788,7 +788,7 @@ function moveToPost(mode) {
} */ } */
} catch (e) { } catch (e) {
exception_error(e, "moveToPost"); exception_error("moveToPost", e);
} }
} }
@ -820,7 +820,7 @@ function toggleSelected(id) {
row.className = nc; row.className = nc;
} }
} catch (e) { } catch (e) {
exception_error(e, "toggleSelected"); exception_error("toggleSelected", e);
} }
} }
@ -831,7 +831,7 @@ function toggleUnread_afh(effect) {
elem.style.backgroundColor = ""; elem.style.backgroundColor = "";
} catch (e) { } catch (e) {
exception_error(e, "toggleUnread_afh"); exception_error("toggleUnread_afh", e);
} }
} }
@ -1315,7 +1315,7 @@ function editTagsInsert() {
found_tags.selectedIndex = 0; found_tags.selectedIndex = 0;
} catch (e) { } catch (e) {
exception_error(e, "editTagsInsert"); exception_error("editTagsInsert", e);
} }
} }
@ -1349,7 +1349,7 @@ function cdmArticleIsBelowViewport(id) {
} }
} catch (e) { } catch (e) {
exception_error(e, "cdmArticleIsVisible"); exception_error("cdmArticleIsVisible", e);
} }
} }
@ -1369,7 +1369,7 @@ function cdmArticleIsAboveViewport(id) {
} }
} catch (e) { } catch (e) {
exception_error(e, "cdmArticleIsVisible"); exception_error("cdmArticleIsVisible", e);
} }
} }
@ -1383,7 +1383,7 @@ function cdmScrollToArticleId(id) {
ctr.scrollTop = e.offsetTop; ctr.scrollTop = e.offsetTop;
} catch (e) { } catch (e) {
exception_error(e, "cdmScrollToArticleId"); exception_error("cdmScrollToArticleId", e);
} }
} }
@ -1413,7 +1413,7 @@ function cdmArticleIsActuallyVisible(id) {
return false; return false;
} catch (e) { } catch (e) {
exception_error(e, "cdmArticleIsVisible"); exception_error("cdmArticleIsVisible", e);
} }
} }
@ -1491,7 +1491,7 @@ function cdmWatchdog() {
_cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 4000); _cdm_wd_timeout = window.setTimeout("cdmWatchdog()", 4000);
} catch (e) { } catch (e) {
exception_error(e, "cdmWatchdog"); exception_error("cdmWatchdog", e);
} }
} }