Merge pull request #151 from XhmikosR/combine-js

Combine javascript files.

_includes/footer.html

@@ -13,18 +13,12 @@
         </div>
       </footer>
 
-    </div><!-- /container -->
+    </div> <!-- /container -->
 
-    <script src="/javascripts/jquery-1.10.2.min.js"></script>
-    <script src="/javascripts/jquery.qtip.min.js"></script>
-
-    {% if page.layout == "license" %}
-      <script src="/javascripts/ZeroClipboard.min.js"></script>
+    {% if page.layout == "license" or page.class == "license-types" %}
+    <script src="/javascripts/javascript.js"></script>
     {% endif %}
 
-    <script src="/javascripts/annotations.js"></script>
-    <script src="/javascripts/app.js"></script>
-
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

_includes/js/annotations.js

@@ -1,5 +1,3 @@
----
----
 var annotations = {
 {% for type_hash in site.rules %}
   "{{ type_hash[0] }}": {
@@ -8,4 +6,4 @@ var annotations = {
     {% endfor %}
   }{% if forloop.rindex0 > 0 %},{% endif %}
 {% endfor %}
-}
+};

javascripts/javascript.js

@@ -0,0 +1,9 @@
+---
+layout: nil
+---
+
+{% include js/jquery-1.10.2.min.js %}
+{% include js/jquery.qtip.min.js %}
+{% include js/ZeroClipboard.min.js %}
+{% include js/annotations.js %}
+{% include js/app.js %}

script/cibuild

@@ -3,7 +3,7 @@
 set -e
 
 echo "compiling javascript..."
-./node_modules/.bin/coffee -c javascripts/app.coffee
+./node_modules/.bin/coffee -c _includes/js/app.coffee
 
 echo "building the site..."
 bundle exec rake test

script/server

@@ -3,7 +3,7 @@
 set -e
 
 echo "compiling javascript..."
-./node_modules/.bin/coffee -c javascripts/app.coffee
+./node_modules/.bin/coffee -c _includes/js/app.coffee
 
 echo "spinning up the server..."
 bundle exec jekyll serve -w