From cb287d1f1be13beaba7fe84c906dd0683dfb9fb5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 04 Jan 2016 09:05:54 -0500
Subject: [PATCH] Merge branch 'mergebranch'
---
interface/web/themes/default/assets/javascripts/ispconfig.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index cf82d3d..439bd69 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -608,7 +608,9 @@
});
$(document).on('click', 'a[data-load-content],button[data-load-content]', function(e) {
- //e.preventDefault();
+ e.preventDefault();
+ $('html, body').animate({scrollTop: $('#pageContent').offset().top}, 1000);
+
var content_to_load = $(this).attr('data-load-content');
if(!content_to_load) return this;
@@ -616,7 +618,9 @@
});
$(document).on('click', 'a[data-capp],button[data-capp]', function(e) {
- //e.preventDefault();
+ e.preventDefault();
+ $('html, body').animate({scrollTop: $('#pageContent').offset().top}, 1000);
+
var content_to_load = $(this).attr('data-capp');
if(!content_to_load) return this;
@@ -624,7 +628,8 @@
});
$(document).on('click', 'a[data-submit-form],button[data-submit-form]', function(e) {
- //e.preventDefault();
+ e.preventDefault();
+ $('html, body').animate({scrollTop: $('#pageContent').offset().top}, 1000);
var $el = $(this);
var act = $el.attr('data-form-action');
--
Gitblit v1.9.1