archive/Keyboard-Mechanizer
Archived
1
Fork 0
Code Releases Packages Activity

Fixed jquery

Browse source
This commit is contained in:
Jake Howard 2015-11-03 18:40:12 +00:00
parent 214adefd94
commit 114ebce52f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/build-js.sh
View file

@ -3,7 +3,7 @@
set -e set -e
echo ">> Building Libraries..." echo ">> Building Libraries..."
# uglifyjs node_modules/jquery/dist/jquery.js --compress --screw-ie8 --define --stats --keep-fnames -o build/lib/jquery.js uglifyjs node_modules/jquery/dist/jquery.js --compress --screw-ie8 --define --stats --keep-fnames -o build/lib/jquery.js
uglifyjs node_modules/bootstrap/dist/js/bootstrap.js --compress --screw-ie8 --define --stats --keep-fnames -o build/lib/bootstrap.js uglifyjs node_modules/bootstrap/dist/js/bootstrap.js --compress --screw-ie8 --define --stats --keep-fnames -o build/lib/bootstrap.js
echo ">> Building Application JS..." echo ">> Building Application JS..."

2
src/js/app.js
View file

@ -2,5 +2,7 @@ var React = require('react');
var Home = require('./components/home'); var Home = require('./components/home');
var NavBar = require('./components/navbar'); var NavBar = require('./components/navbar');
window.$ = window.jQuery = window.require('./lib/jquery.js');
React.render(<NavBar />, document.getElementById('NavBarContainer')); React.render(<NavBar />, document.getElementById('NavBarContainer'));
React.render(<Home />, document.getElementById('AppContainer')); React.render(<Home />, document.getElementById('AppContainer'));