From bccfc0906fb4534ccbea3fc8d0358cc53f6acf08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Fri, 20 Nov 2015 16:17:08 +0100 Subject: [PATCH] Revert super funny-"Important minor fix" We better want this not to go live This reverts commit b77fefb55c1a84b026d5365cd8150d4fb175f7e4. Conflicts: js/constants/application_constants.js --- .../proxy_routes/auth_proxy_handler.js | 20 ------------------- js/constants/application_constants.js | 3 --- 2 files changed, 23 deletions(-) diff --git a/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js b/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js index 18104d7b..b2d552a7 100644 --- a/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js +++ b/js/components/ascribe_routes/proxy_routes/auth_proxy_handler.js @@ -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; diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js index 67e79bfb..a58a8cc6 100644 --- a/js/constants/application_constants.js +++ b/js/constants/application_constants.js @@ -114,9 +114,6 @@ const constants = { }, 'twitter': { 'sdkUrl': 'https://platform.twitter.com/widgets.js' - }, - 'fartscroll': { - 'sdkUrl': 'https://rawgit.com/theonion/fartscroll.js/master/fartscroll.js' } };