Compare commits

...
9 Commits
Author SHA1 Message Date
Kim Gardner 1c23f72807 Merge pull request #666 from coralproject/bump-version-1-9-1
Bump version 1.9.1
2017-06-08 11:55:08 -04:00
Kim Gardner 8c1eaf09bc Bump version 1.9.1 2017-06-08 11:51:16 -04:00
Wyatt Johnson 6e82c180f7 Merge pull request #665 from coralproject/turn-on-off-topic
Turn on off-topic plugin by default
2017-06-08 09:42:08 -06:00
Kim Gardner 81f3cc808c Turn on off-topic plugin by default 2017-06-08 11:33:06 -04:00
Kim Gardner 55928dff08 Merge pull request #664 from coralproject/fix-reply-bugs
Fix bugs related to reply box
2017-06-08 11:09:10 -04:00
Kim Gardner 9695db0678 Merge branch 'master' into fix-reply-bugs 2017-06-08 11:04:04 -04:00
Kim Gardner 655e53a35c Merge pull request #662 from coralproject/bump-version
Update version number
2017-06-08 11:01:09 -04:00
Chi Vinh Le d61ede2396 Fix bugs related to reply box 2017-06-08 18:44:07 +07:00
Kim Gardner a40dd04c1b Update version number 2017-06-07 19:10:13 -04:00
4 changed files with 17 additions and 11 deletions
@@ -1,4 +1,5 @@
import * as actions from '../constants/stream';
import * as authActions from 'coral-framework/constants/auth';
function getQueryVariable(variable) {
let query = window.location.search.substring(1);
@@ -16,7 +17,6 @@ function getQueryVariable(variable) {
const initialState = {
activeReplyBox: '',
commentCountCache: -1,
assetId: getQueryVariable('asset_id'),
assetUrl: getQueryVariable('asset_url'),
commentId: getQueryVariable('comment_id'),
@@ -25,16 +25,16 @@ const initialState = {
export default function stream(state = initialState, action) {
switch (action.type) {
case authActions.LOGOUT:
return {
...state,
activeReplyBox: '',
};
case actions.SET_ACTIVE_REPLY_BOX:
return {
...state,
activeReplyBox: action.id,
};
case actions.SET_COMMENT_COUNT_CACHE:
return {
...state,
commentCountCache: action.amount,
};
case actions.VIEW_ALL_COMMENTS:
return {
...state,
+5 -2
View File
@@ -9,6 +9,10 @@ class ReplyBox extends Component {
document.getElementById('replyText').focus();
}
cancelReply = () => {
this.props.setActiveReplyBox('');
};
render() {
const {
styles,
@@ -18,7 +22,6 @@ class ReplyBox extends Component {
addNotification,
parentId,
commentPostedHandler,
setActiveReplyBox,
maxCharCount,
charCountEnable
} = this.props;
@@ -28,7 +31,7 @@ class ReplyBox extends Component {
charCountEnable={charCountEnable}
commentPostedHandler={commentPostedHandler}
parentId={parentId}
cancelButtonClicked={setActiveReplyBox}
cancelButtonClicked={this.cancelReply}
addNotification={addNotification}
authorId={authorId}
assetId={assetId}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "talk",
"version": "1.8.0",
"version": "1.9.1",
"description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
"main": "app.js",
"scripts": {
+5 -2
View File
@@ -3,11 +3,14 @@
"coral-plugin-respect",
"coral-plugin-like",
"coral-plugin-facebook-auth",
"coral-plugin-auth"
"coral-plugin-auth",
"coral-plugin-offtopic"
],
"client": [
"coral-plugin-respect",
"coral-plugin-like",
"coral-plugin-auth"
"coral-plugin-auth",
"coral-plugin-offtopic",
"coral-plugin-viewing-options"
]
}