[deltacloud-devel] [PATCH] remove unnecessary JS file. Move to application.js

[Jakub Steiner]

As per Jay's request, removing file redundancy. Unlike all my previous patches, 
this should actually apply cleanly on next.

---
 src/app/views/layouts/aggregator.haml |    1 -
 src/public/javascripts/application.js |   15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/app/views/layouts/aggregator.haml 
b/src/app/views/layouts/aggregator.haml
index 8430b0a..61da127 100644
--- a/src/app/views/layouts/aggregator.haml
+++ b/src/app/views/layouts/aggregator.haml
@@ -19,7 +19,6 @@
     = javascript_include_tag "jquery.ui-1.8.1/jquery-ui-1.8.1.custom.min.js"
     = javascript_include_tag "jquery.loadmask.min"
     = javascript_include_tag "jquery.html5form"
-    = javascript_include_tag "aggregator"
 
     = yield :scripts
   - if controller.respond_to?(:section_id)
diff --git a/src/public/javascripts/application.js 
b/src/public/javascripts/application.js
index 1af4f77..4737f6c 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -48,5 +48,20 @@ var Aggregator = {
         wrapper.load(url, function() {$(".wrapper", table).unmask()});
       }, delay);
     });
+  },
+
+  positionFooter: function () {
+    var $footer = $('footer');
+    if ($(document.body).height() < $(window).height()) {
+      $footer.addClass('fixed');
+    } else {
+      $footer.removeClass('fixed');
+    }
   }
 }
+
+/* Aggregator JS */
+
+$(document).ready(function () {
+  
$(window).scroll(Aggregator.positionFooter).resize(Aggregator.positionFooter).scroll();
+});
-- 
1.7.2.3

_______________________________________________
deltacloud-devel mailing list
deltacloud-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel