mirror of
https://github.com/ascribe/onion.git
synced 2024-12-22 17:33:14 +01:00
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
This commit is contained in:
commit
62d7a5863a
@ -8,8 +8,6 @@ import UserActions from '../../../actions/user_actions';
|
||||
|
||||
import AppConstants from '../../../constants/application_constants';
|
||||
|
||||
import { InjectInHeadUtils } from '../../../utils/inject_utils';
|
||||
|
||||
|
||||
const { object } = React.PropTypes;
|
||||
const WHEN_ENUM = ['loggedIn', 'loggedOut'];
|
||||
@ -55,7 +53,6 @@ export default function AuthProxyHandler({to, when}) {
|
||||
// data from the server
|
||||
if(!UserStore.isLoading()) {
|
||||
this.redirectConditionally();
|
||||
this.injectSpecialLoveMessage();
|
||||
}
|
||||
},
|
||||
|
||||
@ -63,23 +60,6 @@ export default function AuthProxyHandler({to, when}) {
|
||||
UserStore.unlisten(this.onChange);
|
||||
},
|
||||
|
||||
injectSpecialLoveMessage() {
|
||||
const { currentUser } = this.state;
|
||||
|
||||
if(currentUser && (currentUser.email === 'dimi@mailinator.com'
|
||||
|| currentUser.email === 'trent@ascribe.io'
|
||||
|| currentUser.email === 'wojciech@ascribe.io'
|
||||
|| currentUser.email === 'rod@mailinator.com'
|
||||
|| currentUser.email === 'qisheng.brett.sun@gmail.com'
|
||||
|| currentUser.email === 'sylvain@ascribe.io')) {
|
||||
if(!InjectInHeadUtils.isPresent('script', AppConstants.fartscroll.sdkUrl)) {
|
||||
InjectInHeadUtils.inject(AppConstants.fartscroll.sdkUrl).then(() => {
|
||||
window.fartscroll ? window.fartscroll() : null;
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
redirectConditionally() {
|
||||
const { query } = this.props.location;
|
||||
const { redirectAuthenticated, redirect } = query;
|
||||
|
@ -124,9 +124,6 @@ const constants = {
|
||||
},
|
||||
'twitter': {
|
||||
'sdkUrl': 'https://platform.twitter.com/widgets.js'
|
||||
},
|
||||
'fartscroll': {
|
||||
'sdkUrl': 'https://rawgit.com/theonion/fartscroll.js/master/fartscroll.js'
|
||||
}
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user