Merge pull request #144 from shakacode/justin808-change-to-applicationjs-order

Update application.js

Author: justin808

app/assets/javascripts/application.js

@@ -10,16 +10,18 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 
-// Need to be on top to allow Poltergeist test to work with React: es5-shim/es5-shim. This is lincluded in app-bundle.
-//= require react_on_rails
-
-// It is important that generated/vendor-bundle must be before bootstrap since it is exposing jQuery and jQuery-ujs
+// CRITICAL that generated/vendor-bundle must be BEFORE bootstrap-sprockets and turbolinks since it is
+// exposing jQuery and jQuery-ujs
 //= require generated/vendor-bundle
 //= require generated/app-bundle
 
-//= require bootstrap-sprockets
+// Next two depend on jQuery
 //= require turbolinks
+//= require bootstrap-sprockets
+
+//= require react_on_rails
 
+// TODO: move to this separate file.
 $(document).on('ready page:load', function () {
   $('nav a').parents('li,ul').removeClass('active');
   $('nav a[href="' + this.location.pathname + '"]').parents('li,ul').addClass('active');