Resending my earlier patches so that they apply on next cleanly again.
---
src/app/views/layouts/aggregator.haml | 1 -
src/public/javascripts/aggregator.js | 16 ----------------
src/public/javascripts/application.js | 15 +++++++++++++++
3 files changed, 15 insertions(+), 17 deletions(-)
delete mode 100644 src/public/javascripts/aggregator.js
diff --git a/src/app/views/layouts/aggregator.haml
b/src/app/views/layouts/aggregator.haml
index 271cae1..15b9a46 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/aggregator.js
b/src/public/javascripts/aggregator.js
deleted file mode 100644
index e5e1175..0000000
--- a/src/public/javascripts/aggregator.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Aggregator JS */
-
-$(document).ready(function () {
- $(window).scroll(positionFooter).resize(positionFooter).scroll();
- //$("form").html5form();
-});
-
-
-function positionFooter() {
- var $footer = $('footer');
- if ($(document.body).height() < $(window).height()) {
- $footer.addClass('fixed');
- } else {
- $footer.removeClass('fixed');
- }
-}
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
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
