[Fmsystem-commits] [13544] revert back to old jquery library

[Sigurd Nes]

Revision: 13544
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13544
Author:   sigurdne
Date:     2015-07-01 12:01:31 +0000 (Wed, 01 Jul 2015)
Log Message:
-----------
revert back to old jquery library

Modified Paths:
--------------
    branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
    branches/Version-1_0-branch/phpgwapi/templates/portico/js/menu.js

Modified: branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php       
2015-07-01 09:20:45 UTC (rev 13543)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.jquery.inc.php       
2015-07-01 12:01:31 UTC (rev 13544)
@@ -56,8 +56,8 @@
                        case 'core':
                                $load = array
                                        (
-                                       //"js/jquery-1.11.1{$_type}",
-                                       "js/jquery-2.1.1{$_type}",
+                                       "js/jquery-1.11.1{$_type}",
+//                                     "js/jquery-2.1.1{$_type}",
 //                                             "js/jquery-migrate-1.2.1"
                                );
                                break;
@@ -65,8 +65,10 @@
                        case 'datepicker':
                                $load = array
                                        (
-                                       "js/jquery-2.1.1{$_type}",
-                                       "js/jquery-ui-1.11.1{$_type}",
+//                                     "js/jquery-2.1.1{$_type}",
+//                                     "js/jquery-ui-1.11.1{$_type}",
+                                       "js/jquery-1.11.1{$_type}",
+                                       "js/jquery-ui-1.10.4.custom{$_type}",
                                        
"development-bundle/ui/i18n/jquery.ui.datepicker-{$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']}",
 //                                             "js/jquery-migrate-1.2.1"
                                );
@@ -75,7 +77,8 @@
                        case 'validator':
                                $load = array
                                        (
-                                       "js/jquery-2.1.1{$_type}",
+//                                     "js/jquery-2.1.1{$_type}",
+                                       "js/jquery-1.11.1{$_type}",
                                        
"validator/jquery.form-validator{$_type}"
                                );
                                
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/validator/css/main.css");
@@ -85,8 +88,10 @@
                        case 'autocomplete':
                                $load = array
                                        (
-                                       "js/jquery-2.1.1{$_type}",
-                                       "js/jquery-ui-1.11.1{$_type}",
+//                                     "js/jquery-2.1.1{$_type}",
+//                                     "js/jquery-ui-1.11.1{$_type}",
+                                       "js/jquery-1.11.1{$_type}",
+                                       "js/jquery-ui-1.10.4.custom{$_type}",
 //                                             "js/jquery-migrate-1.2.1"
                                );
 
@@ -97,7 +102,8 @@
                        case 'tabview':
                                $load = array
                                        (
-                                       "js/jquery-2.1.1{$_type}",
+//                                     "js/jquery-2.1.1{$_type}",
+                                       "js/jquery-1.11.1{$_type}",
                                //      "tabs/jquery.responsiveTabs{$_type}",
                                        "tabs/jquery.responsiveTabs",
                                        'common'
@@ -110,7 +116,8 @@
                        case 'mmenu':
                                $load = array
                                        (
-                                       "js/jquery-2.1.1{$_type}",
+//                                     "js/jquery-2.1.1{$_type}",
+                                       "js/jquery-1.11.1{$_type}",
                                        "mmenu/src/js/jquery.mmenu.min.all"
                                );
 
@@ -121,7 +128,8 @@
                        case 'treeview':
                                $load = array
                                        (
-                                       "js/jquery-2.1.1{$_type}",
+//                                     "js/jquery-2.1.1{$_type}",
+                                       "js/jquery-1.11.1{$_type}",
                                        "treeview/jstree{$_type}"
                                );
 
@@ -132,7 +140,8 @@
                        case 'numberformat':
                                $load = array
                                        (
-                                       "js/jquery-2.1.1{$_type}",
+//                                     "js/jquery-2.1.1{$_type}",
+                                       "js/jquery-1.11.1{$_type}",
                                        "number-format/jquery.number{$_type}"
                                );
 
@@ -140,8 +149,10 @@
                        case 'layout':
                                $load = array
                                (
-                                       "js/jquery-2.1.1{$_type}",
-                                       "js/jquery-ui-1.11.1{$_type}",
+//                                     "js/jquery-2.1.1{$_type}",
+//                                     "js/jquery-ui-1.11.1{$_type}",
+                                       "js/jquery-1.11.1{$_type}",
+                                       "js/jquery-ui-1.10.4.custom{$_type}",
                                        'layout'=> 
array("jquery.layout{$_type}", "plugins/jquery.layout.state")
                                );
                                break;
@@ -367,4 +378,4 @@
 
        }
 
-}
\ No newline at end of file
+}

Modified: branches/Version-1_0-branch/phpgwapi/templates/portico/js/menu.js
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/portico/js/menu.js   
2015-07-01 09:20:45 UTC (rev 13543)
+++ branches/Version-1_0-branch/phpgwapi/templates/portico/js/menu.js   
2015-07-01 12:01:31 UTC (rev 13544)
@@ -148,7 +148,7 @@
                }
                else
                {
-                       alert('Sorry! No web storage support..');
+//                     alert('Sorry! No web storage support..');
                }
 
                if(cached_mapping)