diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/App.js | 16 | ||||
| -rw-r--r-- | js/CommonDialogs.js | 30 | ||||
| -rwxr-xr-x | js/FeedTree.js | 9 | ||||
| -rw-r--r-- | js/Feeds.js | 15 | ||||
| -rwxr-xr-x | js/Headlines.js | 56 | ||||
| -rw-r--r-- | js/PrefHelpers.js | 9 | ||||
| -rw-r--r-- | js/PrefUsers.js | 2 | ||||
| -rwxr-xr-x | js/common.js | 3 |
8 files changed, 112 insertions, 28 deletions
@@ -17,6 +17,9 @@ const App = { hotkey_actions: {}, is_prefs: false, LABEL_BASE_INDEX: -1024, + UserAccessLevels: { + ACCESS_LEVEL_READONLY: -1 + }, _translations: {}, Hash: { get: function() { @@ -76,10 +79,15 @@ const App = { </select> ` }, - select_hash: function(name, value, values = {}, attributes = {}, id = "") { + select_hash: function(name, value, values = {}, attributes = {}, id = "", params = {}) { + let keys = Object.keys(values); + + if (params.numeric_sort) + keys = keys.sort((a,b) => a - b); + return ` <select name="${name}" dojoType="fox.form.Select" id="${App.escapeHtml(id)}" ${this.attributes_to_string(attributes)}> - ${Object.keys(values).map((vk) => + ${keys.map((vk) => `<option ${vk == value ? 'selected="selected"' : ''} value="${App.escapeHtml(vk)}">${App.escapeHtml(values[vk])}</option>` ).join("")} </select> @@ -812,6 +820,10 @@ const App = { App.updateRuntimeInfo(); }, 60 * 1000) + if (App.getInitParam("safe_mode") && this.isPrefs()) { + CommonDialogs.safeModeWarning(); + } + console.log("second stage ok"); }, diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js index a68dc8068..4cfc6ec70 100644 --- a/js/CommonDialogs.js +++ b/js/CommonDialogs.js @@ -11,6 +11,21 @@ const CommonDialogs = { const dialog = dijit.byId("infoBox"); if (dialog) dialog.hide(); }, + safeModeWarning: function() { + const dialog = new fox.SingleUseDialog({ + title: __("Safe mode"), + content: `<div class='alert alert-info'> + ${__('Tiny Tiny RSS is running in safe mode. All themes and plugins are disabled. You will need to log out and back in to disable it.')} + </div> + <footer class='text-center'> + <button dojoType='dijit.form.Button' type='submit' class='alt-primary'> + ${__('Close this window')} + </button> + </footer>` + }); + + dialog.show(); + }, subscribeToFeed: function() { xhr.json("backend.php", {op: "feeds", method: "subscribeToFeed"}, @@ -131,6 +146,9 @@ const CommonDialogs = { console.log(rc); switch (parseInt(rc['code'])) { + case 0: + dialog.show_error(__("You are already subscribed to this feed.")); + break; case 1: dialog.hide(); Notify.info(__("Subscribed to %s").replace("%s", feed_url)); @@ -175,8 +193,11 @@ const CommonDialogs = { case 6: dialog.show_error(__("XML validation failed: %s").replace("%s", rc['message'])); break; - case 0: - dialog.show_error(__("You are already subscribed to this feed.")); + case 7: + dialog.show_error(__("Error while creating feed database entry.")); + break; + case 8: + dialog.show_error(__("You are not allowed to perform this operation.")); break; } @@ -451,6 +472,7 @@ const CommonDialogs = { xhr.json("backend.php", {op: "pref-feeds", method: "editfeed", id: feed_id}, (reply) => { const feed = reply.feed; + const is_readonly = reply.user.access_level == App.UserAccessLevels.ACCESS_LEVEL_READONLY; // for unsub prompt dialog.feed_title = feed.title; @@ -524,7 +546,9 @@ const CommonDialogs = { <fieldset> <label>${__("Update interval:")}</label> - ${App.FormFields.select_hash("update_interval", feed.update_interval, reply.intervals.update)} + ${App.FormFields.select_hash("update_interval", is_readonly ? -1 : feed.update_interval, + reply.intervals.update, + {disabled: is_readonly})} </fieldset> <fieldset> <label>${__('Article purging:')}</label> diff --git a/js/FeedTree.js b/js/FeedTree.js index e0c44e2b5..f6c44a71e 100755 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -102,6 +102,15 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co }})); menu.addChild(new dijit.MenuItem({ + label: __("Open site"), + onClick: function() { + App.postOpenWindow("backend.php", {op: "feeds", method: "opensite", + feed_id: this.getParent().row_id, csrf_token: __csrf_token}); + }})); + + menu.addChild(new dijit.MenuSeparator()); + + menu.addChild(new dijit.MenuItem({ label: __("Debug feed"), onClick: function() { /* global __csrf_token */ diff --git a/js/Feeds.js b/js/Feeds.js index 27586ab13..5ef554af0 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -278,19 +278,8 @@ const Feeds = { } if (App.getInitParam("safe_mode")) { - const dialog = new fox.SingleUseDialog({ - title: __("Safe mode"), - content: `<div class='alert alert-info'> - ${__('Tiny Tiny RSS is running in safe mode. All themes and plugins are disabled. You will need to log out and back in to disable it.')} - </div> - <footer class='text-center'> - <button dojoType='dijit.form.Button' type='submit' class='alt-primary'> - ${__('Close this window')} - </button> - </footer>` - }); - - dialog.show(); + /* global CommonDialogs */ + CommonDialogs.safeModeWarning(); } // bw_limit disables timeout() so we request initial counters separately diff --git a/js/Headlines.js b/js/Headlines.js index d01993838..7557676ee 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -490,6 +490,7 @@ const Headlines = { id="RROW-${hl.id}" data-article-id="${hl.id}" data-orig-feed-id="${hl.feed_id}" + data-orig-feed-title="${App.escapeHtml(hl.feed_title)}" data-is-packed="1" data-content="${App.escapeHtml(hl.content)}" data-rendered-enclosures="${App.escapeHtml(Article.renderEnclosures(hl.enclosures))}" @@ -514,10 +515,8 @@ const Headlines = { ${hl.cdm_excerpt ? hl.cdm_excerpt : ""} </span> - <div class="feed"> - <a href="#" style="background-color: ${hl.feed_bg_color}" - onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a> - </div> + <a href="#" class="feed vfeedMenuAttach" style="background-color: ${hl.feed_bg_color}" data-feed-id="${hl.feed_id}" + onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a> <span class="updated" title="${hl.imported}">${hl.updated}</span> @@ -566,6 +565,7 @@ const Headlines = { row = `<div class="hl ${row_class} ${Article.getScoreClass(hl.score)}" id="RROW-${hl.id}" data-orig-feed-id="${hl.feed_id}" + data-orig-feed-title="${App.escapeHtml(hl.feed_title)}" data-article-id="${hl.id}" data-score="${hl.score}" data-article-title="${App.escapeHtml(hl.title)}" @@ -584,9 +584,9 @@ const Headlines = { ${Article.renderLabels(hl.id, hl.labels)} </span> </div> - <span class="feed"> - <a style="background : ${hl.feed_bg_color}" href="#" onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a> - </span> + <span class="feed vfeedMenuAttach" data-feed-id="${hl.feed_id}"> + <a style="background : ${hl.feed_bg_color}" href="#" onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a> + </span> <div title="${hl.imported}"> <span class="updated">${hl.updated}</span> </div> @@ -1501,6 +1501,48 @@ const Headlines = { menu.startup(); } + /* vfeed menu */ + + if (!dijit.byId("vfeedMenu")) { + + const menu = new dijit.Menu({ + id: "vfeedMenu", + targetNodeIds: ["headlines-frame"], + selector: ".vfeedMenuAttach" + }); + + menu.addChild(new dijit.MenuItem({ + label: __("Mark as read"), + onClick: function() { + Feeds.catchupFeed(this.getParent().currentTarget.getAttribute("data-feed-id")); + }})); + + menu.addChild(new dijit.MenuItem({ + label: __("Edit feed"), + onClick: function() { + CommonDialogs.editFeed(this.getParent().currentTarget.getAttribute("data-feed-id"), false); + }})); + + menu.addChild(new dijit.MenuItem({ + label: __("Open site"), + onClick: function() { + App.postOpenWindow("backend.php", {op: "feeds", method: "opensite", + feed_id: this.getParent().currentTarget.getAttribute("data-feed-id"), csrf_token: __csrf_token}); + }})); + + menu.addChild(new dijit.MenuSeparator()); + + menu.addChild(new dijit.MenuItem({ + label: __("Debug feed"), + onClick: function() { + /* global __csrf_token */ + App.postOpenWindow("backend.php", {op: "feeds", method: "updatedebugger", + feed_id: this.getParent().currentTarget.getAttribute("data-feed-id"), csrf_token: __csrf_token}); + }})); + + menu.startup(); + } + /* vgroup feed title menu */ if (!dijit.byId("headlinesFeedTitleMenu")) { diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js index 30a4544fe..c0fff66c9 100644 --- a/js/PrefHelpers.js +++ b/js/PrefHelpers.js @@ -363,8 +363,15 @@ const Helpers = { xhr.json("backend.php", {op: "pref-prefs", method: "getPluginsList"}, (reply) => { this._list_of_plugins = reply; this.render_contents(); + }, (e) => { + this.render_error(e); }); }, + render_error: function(e) { + const container = document.querySelector(".prefs-plugin-list"); + + container.innerHTML = `<li class='text-error'>${__("Error while loading plugins list: %s.").replace("%s", e)}</li>`; + }, render_contents: function() { const container = document.querySelector(".prefs-plugin-list"); @@ -450,7 +457,7 @@ const Helpers = { xhr.json("backend.php", {op: "pref-prefs", method: "uninstallPlugin", plugin: plugin}, (reply) => { if (reply && reply.status == 1) - Helpers.Prefs.refresh(); + Helpers.Plugins.reload(); else { Notify.error("Plugin uninstallation failed."); } diff --git a/js/PrefUsers.js b/js/PrefUsers.js index 7ce3cae94..a6081f35f 100644 --- a/js/PrefUsers.js +++ b/js/PrefUsers.js @@ -75,7 +75,7 @@ const Users = { <fieldset> <label>${__('Access level: ')}</label> ${App.FormFields.select_hash("access_level", - user.access_level, reply.access_level_names, {disabled: admin_disabled.toString()})} + user.access_level, reply.access_level_names, {disabled: admin_disabled.toString()}, "", {numeric_sort: true})} ${admin_disabled ? App.FormFields.hidden_tag("access_level", user.access_level.toString()) : ''} diff --git a/js/common.js b/js/common.js index 1299a0c64..b972f2376 100755 --- a/js/common.js +++ b/js/common.js @@ -186,7 +186,7 @@ const xhr = { }, json: function(url, params = {}, complete = undefined, failed = undefined) { return new Promise((resolve, reject) => - this.post(url, params).then((data) => { + this.post(url, params, null, failed).then((data) => { let obj = null; try { @@ -198,6 +198,7 @@ const xhr = { failed(e); reject(e); + return; } console.log('xhr.json', '<<<', obj, (new Date().getTime() - xhr._ts) + " ms"); |