[xoops-svn] SF.net SVN: xoops:[9711] XoopsModules/smallworld/trunk/smallworld/preloads/ core.php

[<dj...@us...>]

Revision: 9711
          http://xoops.svn.sourceforge.net/xoops/?rev=9711&view=rev
Author:   djculex
Date:     2012-06-25 13:59:53 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
- Bugfix: Smallworld jquery.js and jquery.ui.js is extended after load then overwritten by xoops javascript. Special check for xoops version is included in core.php

Modified Paths:
--------------
    XoopsModules/smallworld/trunk/smallworld/preloads/core.php

Modified: XoopsModules/smallworld/trunk/smallworld/preloads/core.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/preloads/core.php	2012-06-25 13:57:20 UTC (rev 9710)
+++ XoopsModules/smallworld/trunk/smallworld/preloads/core.php	2012-06-25 13:59:53 UTC (rev 9711)
@@ -43,8 +43,17 @@
             $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/base/jquery.ui.all.css');
             $xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');                        
             
-            $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-1.7.1.min.js');
-            $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-ui-1.8.11.custom.js');
+            
+            //Check xoops version. If bigger than 2.5.0 then include by internal jquery plugins
+            
+            $ver = explode(" ", XOOPS_VERSION);
+            if ($ver[1] >= '2.4.0') {           
+                $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/jquery.js');
+                $xoTheme->addScript(XOOPS_URL.'/browse.php?Frameworks/jquery/plugins/jquery.ui.js');                                     
+            } else {
+                $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-1.7.1.min.js');
+                $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery-ui-1.8.11.custom.js');
+            }
         
             $myid = $xoopsUser->getVar('uid');
             // GET various variables from language folder

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.