1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00

Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form

This commit is contained in:
Tim Daubenschütz 2015-11-20 16:20:24 +01:00
commit 62d7a5863a
2 changed files with 0 additions and 23 deletions

View File

@ -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;

View File

@ -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'
}
};