aboutsummaryrefslogtreecommitdiff
path: root/src/web/js/actions
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2016-04-06 23:59:01 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2016-04-06 23:59:01 +0200
commita0a3bda9340a57203391400a5ac32e87281e8a19 (patch)
tree040d69d70cb9e2b649259052ecc1f6984b123db2 /src/web/js/actions
parentmajor problems fixed. (diff)
parentcreate a new user is now working (diff)
downloadnewspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.tar.gz
newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.tar.bz2
newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.zip
Fixed merge conflicts.
Diffstat (limited to 'src/web/js/actions')
-rw-r--r--src/web/js/actions/RightPanelActions.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/web/js/actions/RightPanelActions.js b/src/web/js/actions/RightPanelActions.js
index 47adad79..5d78e001 100644
--- a/src/web/js/actions/RightPanelActions.js
+++ b/src/web/js/actions/RightPanelActions.js
@@ -4,8 +4,12 @@ var ActionTypes = require('../constants/JarrConstants');
var MenuActions = require('../actions/MenuActions');
var RightPanelActions = {
- loadArticle: function(article_id, was_read_before) {
- jquery.getJSON('/getart/' + article_id,
+ loadArticle: function(article_id, was_read_before, to_parse) {
+ var suffix = '';
+ if(to_parse) {
+ suffix = '/parse';
+ }
+ jquery.getJSON('/getart/' + article_id + suffix,
function(payload) {
JarrDispatcher.dispatch({
type: ActionTypes.LOAD_ARTICLE,
bgstack15