Commit 8e504bd

mo khan <mo@mokhan.ca>
2014-04-10 04:37:21
merge application.js and application.js.coffee.
1 parent 5277b50
Changed files (2)
app/assets/javascripts/application.js
@@ -1,17 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery
-//= require jquery_ujs
-//= require turbolinks
-//= require bootstrap
-//= require_tree .
app/assets/javascripts/application.js.coffee
@@ -1,3 +1,19 @@
+#// This is a manifest file that'll be compiled into application.js, which will include all the files
+#// listed below.
+#//
+#// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+#// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+#//
+#// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+#// compiled file.
+#//
+#// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+#// about supported directives.
+#//
+#= require jquery
+#= require jquery_ujs
+#= require turbolinks
+#= require bootstrap
 #= require handlebars
 #= require ember
 #= require ember-data