Merge pull request #10949 from BerkeleyTrue/fix/remove-slide-animation

Fix(step): remove slide animation
This commit is contained in:
Quincy Larson
2016-09-28 23:06:32 -07:00
committed by GitHub
8 changed files with 60 additions and 98 deletions

View File

@@ -6,9 +6,7 @@ let trusted = [
if (process.env.NODE_ENV !== 'production') {
trusted = trusted.concat([
'ws://localhost:3001',
'http://localhost:2999',
'ws://localhost:2999'
'ws://localhost:3000'
]);
}

View File

@@ -1,7 +1,4 @@
import manifest from '../rev-manifest';
/* eslint-disable import/default */
import config from '../../webpack.config';
/* eslint-enable import/default */
let chunkManifest;
try {
@@ -30,16 +27,9 @@ function removeOldTerms(str = '') {
return str.replace(challengesRegex, '');
}
function getBundleLocation() {
return __DEV__ ?
config.output.publicPath + '/bundle.js' :
rev('/js', 'bundle.js');
}
export default function jadeHelpers() {
return function jadeHelpersMiddleware(req, res, next) {
res.locals.removeOldTerms = removeOldTerms;
res.locals.getBundleLocation = getBundleLocation;
res.locals.rev = rev;
// static data
res.locals.user = req.user;

View File

@@ -12,4 +12,4 @@ html(lang='en')
script.
window.webpackManifest = !{JSON.stringify(chunkManifest || {})};
script(src=rev('/js', 'vendor-challenges.js'))
script(src=getBundleLocation())
script(src=rev('/js', 'bundle.js'))