glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixup react setup

Browse source
This commit is contained in:
Connor Turland 2016-08-01 16:18:34 -04:00
parent 4005b301ac
commit 17da8441f4
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/src/Metamaps.GlobalUI.js
View file

@ -1,4 +1,4 @@
var Metamaps = {}; // this variable declaration defines a Javascript object that will contain all the variables and functions used by us, broken down into 'sub-modules' that look something like this var Metamaps = window.Metamaps || {}; // this variable declaration defines a Javascript object that will contain all the variables and functions used by us, broken down into 'sub-modules' that look something like this
/* /*
* unless you are on a page with the Javascript InfoVis Toolkit (Topic or Map) the only section in the metamaps * unless you are on a page with the Javascript InfoVis Toolkit (Topic or Map) the only section in the metamaps

2
app/assets/javascripts/src/Metamaps.Header.js
View file

@ -1,4 +1,4 @@
var Metamaps = Metamaps || {} /* global Metamaps, $ */
Metamaps.Header = { Metamaps.Header = {
init: function () { init: function () {

1
app/views/layouts/_foot.html.erb
View file

@ -25,7 +25,6 @@
USERVOICE.load(); USERVOICE.load();
</script> </script>
<script type="text/javascript" src="<%= asset_path 'webpacked/metamaps.bundle.js' %>"></script>
<%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %> <%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %>
</body> </body>
</html> </html>

5
package.json
View file

@ -29,10 +29,9 @@
"webpack": "^1.13.1" "webpack": "^1.13.1"
}, },
"dependencies": { "dependencies": {
"backbone": "^1.0.0", "backbone": "1.0.0",
"react": "^15.3.0", "react": "^15.3.0",
"react-dom": "^15.3.0", "react-dom": "^15.3.0",
"requirejs": "^2.1.1", "underscore": "1.4.4"
"underscore": "^1.4.4"
} }
} }