summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/PrefFilterTree.js28
-rw-r--r--js/functions.js20
-rw-r--r--js/prefs.js40
-rw-r--r--js/tt-rss.js12
-rw-r--r--js/viewfeed.js54
5 files changed, 83 insertions, 71 deletions
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index afa2f445a..3546e30fb 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -1,6 +1,22 @@
dojo.provide("fox.PrefFilterTree");
dojo.require("lib.CheckBoxTree");
+dojo.require("dojo.data.ItemFileWriteStore");
+
+dojo.declare("fox.PrefFilterStore", dojo.data.ItemFileWriteStore, {
+
+ _saveEverything: function(saveCompleteCallback, saveFailedCallback,
+ newFileContentString) {
+
+ dojo.xhrPost({
+ url: "backend.php",
+ content: {op: "pref-filters", method: "savefilterorder",
+ payload: newFileContentString},
+ error: saveFailedCallback,
+ load: saveCompleteCallback});
+ },
+
+});
dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
_createTreeNode: function(args) {
@@ -48,5 +64,17 @@ dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
return (!item.error || item.error == '') ? "dijitTreeRow" :
"dijitTreeRow Error";
},
+ checkItemAcceptance: function(target, source, position) {
+ var item = dijit.getEnclosingWidget(target).item;
+
+ // disable copying items
+ source.copyState = function() { return false; };
+
+ return position != 'over';
+ },
+ onDndDrop: function() {
+ this.inherited(arguments);
+ this.tree.model.store.save();
+ },
});
diff --git a/js/functions.js b/js/functions.js
index 7da9abfbd..0b39cc466 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -415,7 +415,7 @@ function closeInfoBox(cleanup) {
}
-function displayDlg(id, param, callback) {
+function displayDlg(title, id, param, callback) {
notify_progress("Loading, please wait...", true);
@@ -425,14 +425,14 @@ function displayDlg(id, param, callback) {
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function (transport) {
- infobox_callback2(transport);
+ infobox_callback2(transport, title);
if (callback) callback(transport);
} });
return false;
}
-function infobox_callback2(transport) {
+function infobox_callback2(transport, title) {
try {
var dialog = false;
@@ -443,13 +443,7 @@ function infobox_callback2(transport) {
//console.log("infobox_callback2");
notify('');
- var title = transport.responseXML.getElementsByTagName("title")[0];
- if (title)
- title = title.firstChild.nodeValue;
-
- var content = transport.responseXML.getElementsByTagName("content")[0];
-
- content = content.firstChild.nodeValue;
+ var content = transport.responseText;
if (!dialog) {
dialog = new dijit.Dialog({
@@ -639,7 +633,7 @@ function filterDlgCheckDate() {
}
function explainError(code) {
- return displayDlg("explainError", code);
+ return displayDlg(__("Error explained"), "explainError", code);
}
function loading_set_progress(p) {
@@ -836,7 +830,7 @@ function addLabel(select, callback) {
function quickAddFeed() {
try {
- var query = "backend.php?op=dlg&method=quickAddFeed";
+ var query = "backend.php?op=feeds&method=quickAddFeed";
// overlapping widgets
if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive();
@@ -1641,7 +1635,7 @@ function editFeed(feed, event) {
function feedBrowser() {
try {
- var query = "backend.php?op=dlg&method=feedBrowser";
+ var query = "backend.php?op=feeds&method=feedBrowser";
if (dijit.byId("feedAddDlg"))
dijit.byId("feedAddDlg").hide();
diff --git a/js/prefs.js b/js/prefs.js
index 7d12e4202..358625e93 100644
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -91,7 +91,7 @@ function editUser(id, event) {
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
- infobox_callback2(transport);
+ infobox_callback2(transport, __("User Editor"));
document.forms['user_edit_form'].login.focus();
} });
@@ -582,7 +582,7 @@ function selectedUserDetails() {
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
- infobox_callback2(transport);
+ infobox_callback2(transport, __("User details"));
} });
} catch (e) {
exception_error("selectedUserDetails", e);
@@ -767,18 +767,6 @@ function editSelectedFeeds() {
}
}
-function piggie(enable) {
- if (enable) {
- console.log("I LOVEDED IT!");
- var piggie = $("piggie");
-
- Element.show(piggie);
- Position.Center(piggie);
- Effect.Puff(piggie);
-
- }
-}
-
function opmlImportComplete(iframe) {
try {
if (!iframe.contentDocument.body.innerHTML) return false;
@@ -1412,7 +1400,7 @@ function editProfiles() {
if (dijit.byId("profileEditDlg"))
dijit.byId("profileEditDlg").destroyRecursive();
- var query = "backend.php?op=dlg&method=editPrefProfiles";
+ var query = "backend.php?op=pref-prefs&method=editPrefProfiles";
dialog = new dijit.Dialog({
id: "profileEditDlg",
@@ -1563,6 +1551,24 @@ function clearArticleAccessKeys() {
return false;
}
+
+function resetFilterOrder() {
+ try {
+ notify_progress("Loading, please wait...");
+
+ new Ajax.Request("backend.php", {
+ parameters: "?op=pref-filters&method=filtersortreset",
+ onComplete: function(transport) {
+ updateFilterList();
+ } });
+
+
+ } catch (e) {
+ exception_error("resetFilterOrder");
+ }
+}
+
+
function resetFeedOrder() {
try {
notify_progress("Loading, please wait...");
@@ -1709,7 +1715,7 @@ function editLabel(id, event) {
function customizeCSS() {
try {
- var query = "backend.php?op=dlg&method=customizeCSS";
+ var query = "backend.php?op=pref-prefs&method=customizeCSS";
if (dijit.byId("cssEditDlg"))
dijit.byId("cssEditDlg").destroyRecursive();
@@ -1753,7 +1759,7 @@ function gotoExportOpml(filename, settings) {
function batchSubscribe() {
try {
- var query = "backend.php?op=dlg&method=batchSubscribe";
+ var query = "backend.php?op=pref-feeds&method=batchSubscribe";
// overlapping widgets
if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive();
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 6c921c258..51257a693 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -159,7 +159,7 @@ function timeout() {
}
function search() {
- var query = "backend.php?op=dlg&method=search&param=" +
+ var query = "backend.php?op=feeds&method=search&param=" +
param_escape(getActiveFeedId() + ":" + activeFeedIsCat());
if (dijit.byId("searchDlg"))
@@ -428,7 +428,7 @@ function init() {
viewfeed(-2);
};
hotkey_actions["goto_tagcloud"] = function() {
- displayDlg("printTagCloud");
+ displayDlg(__("Tag cloud"), "printTagCloud");
};
hotkey_actions["goto_prefs"] = function() {
gotoPreferences();
@@ -581,10 +581,10 @@ function quickMenuGo(opid) {
gotoLogout();
break;
case "qmcTagCloud":
- displayDlg("printTagCloud");
+ displayDlg(__("Tag cloud"), "printTagCloud");
break;
case "qmcTagSelect":
- displayDlg("printTagSelect");
+ displayDlg(__("Select item(s) by tags"), "printTagSelect");
break;
case "qmcSearch":
search();
@@ -752,10 +752,6 @@ function viewModeChanged() {
return viewCurrentFeed('');
}
-function viewLimitChanged() {
- return viewCurrentFeed('');
-}
-
function rescoreCurrentFeed() {
var actid = getActiveFeedId();
diff --git a/js/viewfeed.js b/js/viewfeed.js
index caf40919e..c24dec62e 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -52,9 +52,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
setActiveFeedId(feed_id, is_cat);
- dijit.getEnclosingWidget(
+ /* dijit.getEnclosingWidget(
document.forms["main_toolbar_form"].update).attr('disabled',
- is_cat || feed_id <= 0);
+ is_cat || feed_id <= 0); */
try {
if (infscroll_req == false) {
@@ -941,23 +941,6 @@ function selectArticles(mode) {
}
}
-function catchupPage() {
-
- var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-
- var str = __("Mark all visible articles in %s as read?");
-
- str = str.replace("%s", fn);
-
- if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
- return;
- }
-
- selectArticles('all');
- selectionToggleUnread(false, 'viewCurrentFeed()', true);
- selectArticles('none');
-}
-
function deleteSelection() {
try {
@@ -1084,7 +1067,7 @@ function catchupSelection() {
}
function editArticleTags(id) {
- var query = "backend.php?op=dlg&method=editArticleTags&param=" + param_escape(id);
+ var query = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
if (dijit.byId("editTagsDlg"))
dijit.byId("editTagsDlg").destroyRecursive();
@@ -1102,22 +1085,25 @@ function editArticleTags(id) {
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
- notify('');
- dialog.hide();
+ try {
+ notify('');
+ dialog.hide();
- var data = JSON.parse(transport.responseText);
+ var data = JSON.parse(transport.responseText);
- if (data) {
- var tags_str = article.tags;
- var id = tags_str.id;
+ if (data) {
+ var id = data.id;
- var tags = $("ATSTR-" + id);
- var tooltip = dijit.byId("ATSTRTIP-" + id);
+ console.log(id);
- if (tags) tags.innerHTML = tags_str.content;
- if (tooltip) tooltip.attr('label', tags_str.content_full);
+ var tags = $("ATSTR-" + id);
+ var tooltip = dijit.byId("ATSTRTIP-" + id);
- cache_delete("article:" + id);
+ if (tags) tags.innerHTML = data.content;
+ if (tooltip) tooltip.attr('label', data.content_full);
+ }
+ } catch (e) {
+ exception_error("editArticleTags/inner", e);
}
}});
@@ -1170,11 +1156,11 @@ function postMouseIn(e, id) {
if (_post_preview_timeout) window.clearTimeout(_post_preview_timeout);
- if (!isCdmMode() || !getInitParam("cdm_expanded")) {
+ /* if (!isCdmMode() || !getInitParam("cdm_expanded")) {
_post_preview_timeout = window.setTimeout(function() {
displaySmallArticlePreview(e, id);
}, 1000);
- }
+ } */
}
function displaySmallArticlePreview(e, id) {
@@ -1553,6 +1539,8 @@ function dismissArticle(id) {
try {
var elem = $("RROW-" + id);
+ if (!elem) return;
+
toggleUnread(id, 0, true);
new Effect.Fade(elem, {duration : 0.5});
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 15:32:38 +0000