From 3989f023592ec61afa305c41ca226fac32b5439d Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Fri, 13 Dec 2013 11:55:10 +0200
Subject: [PATCH] Combine javascript files.

Now the main page doesn't include any JS since it doesn't use them. This results in -4 http requests and a lot of bytes saved.
---
 _includes/footer.html                              | 12 +++---------
 {javascripts => _includes/js}/ZeroClipboard.min.js |  0
 {javascripts => _includes/js}/annotations.js       |  4 +---
 {javascripts => _includes/js}/app.coffee           |  0
 {javascripts => _includes/js}/app.js               |  0
 {javascripts => _includes/js}/jquery-1.10.2.min.js |  0
 {javascripts => _includes/js}/jquery.qtip.min.js   |  0
 javascripts/javascript.js                          |  9 +++++++++
 script/cibuild                                     |  2 +-
 script/server                                      |  2 +-
 10 files changed, 15 insertions(+), 14 deletions(-)
 rename {javascripts => _includes/js}/ZeroClipboard.min.js (100%)
 rename {javascripts => _includes/js}/annotations.js (97%)
 rename {javascripts => _includes/js}/app.coffee (100%)
 rename {javascripts => _includes/js}/app.js (100%)
 rename {javascripts => _includes/js}/jquery-1.10.2.min.js (100%)
 rename {javascripts => _includes/js}/jquery.qtip.min.js (100%)
 create mode 100644 javascripts/javascript.js

diff --git a/_includes/footer.html b/_includes/footer.html
index fd56281..33a40d0 100644
--- a/_includes/footer.html
+++ b/_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),
diff --git a/javascripts/ZeroClipboard.min.js b/_includes/js/ZeroClipboard.min.js
similarity index 100%
rename from javascripts/ZeroClipboard.min.js
rename to _includes/js/ZeroClipboard.min.js
diff --git a/javascripts/annotations.js b/_includes/js/annotations.js
similarity index 97%
rename from javascripts/annotations.js
rename to _includes/js/annotations.js
index ac706c7..9a602b6 100644
--- a/javascripts/annotations.js
+++ b/_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 %}
-}
\ No newline at end of file
+};
diff --git a/javascripts/app.coffee b/_includes/js/app.coffee
similarity index 100%
rename from javascripts/app.coffee
rename to _includes/js/app.coffee
diff --git a/javascripts/app.js b/_includes/js/app.js
similarity index 100%
rename from javascripts/app.js
rename to _includes/js/app.js
diff --git a/javascripts/jquery-1.10.2.min.js b/_includes/js/jquery-1.10.2.min.js
similarity index 100%
rename from javascripts/jquery-1.10.2.min.js
rename to _includes/js/jquery-1.10.2.min.js
diff --git a/javascripts/jquery.qtip.min.js b/_includes/js/jquery.qtip.min.js
similarity index 100%
rename from javascripts/jquery.qtip.min.js
rename to _includes/js/jquery.qtip.min.js
diff --git a/javascripts/javascript.js b/javascripts/javascript.js
new file mode 100644
index 0000000..39b2a06
--- /dev/null
+++ b/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 %}
diff --git a/script/cibuild b/script/cibuild
index 25bf7eb..f0647b6 100755
--- a/script/cibuild
+++ b/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
diff --git a/script/server b/script/server
index 6169ae8..901dd03 100755
--- a/script/server
+++ b/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