[Fusionforge-commits] FusionForge branch master updated. 8ae49854cff63e37f98fae5502cda9a267151a43

Franck Villaume nerville at fusionforge.org
Mon Sep 15 16:49:38 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  8ae49854cff63e37f98fae5502cda9a267151a43 (commit)
      from  0723c43310e75bcbe13276929e182765391c2e61 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8ae49854cff63e37f98fae5502cda9a267151a43
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Sep 15 16:47:40 2014 +0200

    fix previous commit 54fd4c11b564d85eb70895550057f31927db6b3a & add browser jquery function where needed

diff --git a/src/www/include/html.php b/src/www/include/html.php
index fa9ecdf..38550f1 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -494,9 +494,9 @@ function html_use_jqueryjqplotplugindateAxisRenderer() {
 }
 
 function html_use_jqueryteamworkgantt() {
-	html_use_jqueryui();
-	use_javascript('/scripts/jquery-livequery/jquery.livequery.min.js');
-	use_javascript('/scripts/jquery-teamwork-gantt/libs/jquery.timers.js');
+	html_use_jquerybrowser();
+	use_javascript('/scripts/jquery-livequery/jquery.livequery.js');
+	use_javascript('/scripts/jquery-livequery/jquery.timers.js');
 	use_javascript('/scripts/jquery-teamwork-gantt/libs/platform.js');
 	use_javascript('/scripts/jquery-teamwork-gantt/libs/date.js');
 	use_javascript('/scripts/jquery-teamwork-gantt/libs/date.js');
@@ -520,8 +520,12 @@ function html_use_jquerysplitter() {
 }
 
 function html_use_jqueryautoheight() {
-	html_use_jquery();
+	html_use_jquerybrowser();
 	use_javascript('/scripts/jquery-auto-height/jquery.iframe-auto-height.plugin.1.9.5.js');
+}
+
+function html_use_jquerybrowser() {
+	html_use_jquery();
 	use_javascript('/scripts/jquery-auto-height/jquery.browser.js');
 }
 

-----------------------------------------------------------------------

Summary of changes:
 src/www/include/html.php |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list