wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-30 12:40:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

The merge got back some code to the coral-framework.

Browse Source
This commit is contained in:
gaba
2017-05-15 14:23:56 -07:00
parent 423cb3cade
commit c0c6dd6252
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-embed-stream/src/components/CountdownSeconds.js
+3 -4
View File
@@ -1,8 +1,7 @@
import React, {PropTypes} from 'react';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from 'coral-framework/translations';
import I18n from 'coral-i18n/modules/i18n/i18n';
const lang = new I18n(translations);
const lang = new I18n();
/**
* Countdown the number of seconds until a given Date
@@ -30,7 +29,7 @@ export class CountdownSeconds extends React.Component {
componentWillUnmount() {
if (this.countdownInterval) {
this.countdownInterval = clearInterval(this.countdownInterval);
}
}
}
render() {
const now = new Date();
client/coral-embed-stream/src/components/EditableCommentContent.js
+2 -3
View File
@@ -6,9 +6,8 @@ import {CountdownSeconds} from './CountdownSeconds';
import {getEditableUntilDate} from './util';
import {Icon} from 'coral-ui';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from 'coral-framework/translations';
const lang = new I18n(translations);
import I18n from 'coral-i18n/modules/i18n/i18n';
const lang = new I18n();
/**
* Renders a Comment's body in such a way that the end-user can edit it and save changes
client/coral-framework/actions/auth.js
+2 -3
View File
@@ -4,9 +4,8 @@ import * as actions from '../constants/auth';
import coralApi, {base} from '../helpers/response';
import jwtDecode from 'jwt-decode';
const lang = new I18n(translations);
import translations from './../translations';
import I18n from '../../coral-framework/modules/i18n/i18n';
const lang = new I18n();
import I18n from '../../coral-i18n/modules/i18n/i18n';
// Dialog Actions
export const showSignInDialog = () => (dispatch) => {