[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14450] add support for IE 6-8
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14450] add support for IE 6-8 |
|
Date: |
Sun, 22 Nov 2015 11:29:18 +0000 |
Revision: 14450
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14450
Author: sigurdne
Date: 2015-11-22 11:29:17 +0000 (Sun, 22 Nov 2015)
Log Message:
-----------
add support for IE 6-8
Modified Paths:
--------------
branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php
branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
branches/dev-syncromind/phpgwapi/templates/pure/head.tpl
Modified: branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php 2015-11-21
21:10:16 UTC (rev 14449)
+++ branches/dev-syncromind/phpgwapi/inc/class.jquery.inc.php 2015-11-22
11:29:17 UTC (rev 14450)
@@ -50,7 +50,18 @@
*/
public static function load_widget($widget)
{
- $_type = '.min'; // save some download
+ if(preg_match('/MSIE (6|7|8)/',
$_SERVER['HTTP_USER_AGENT']))
+ {
+ $_jquery_core = 'jquery-1.11.3'; // In case we
need IE 6–8 support.
+ }
+ else
+ {
+ $_jquery_core = 'jquery-2.1.4';
+ }
+
+ $_jquery_ui = 'jquery-ui-1.11.4';
+ $_type = '.min'; // save some download
+
if($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'bookingfrontend')
{
$theme = 'humanity';
@@ -65,19 +76,16 @@
case 'core':
$load = array
(
- //"js/jquery-1.11.3{$_type}",
- "js/jquery-2.1.4{$_type}",
-// "js/jquery-migrate-1.2.1"
+ "js/{$_jquery_core}{$_type}",
);
break;
case 'datepicker':
$load = array
(
- "js/jquery-2.1.4{$_type}",
- "js/jquery-ui-1.11.1{$_type}",
+ "js/{$_jquery_core}{$_type}",
+ "js/{$_jquery_ui}{$_type}",
"development-bundle/ui/i18n/jquery.ui.datepicker-{$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']}",
-// "js/jquery-migrate-1.2.1"
);
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui-1.10.4.custom.css");
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/jquery-ui-timepicker-addon.css");
@@ -86,7 +94,7 @@
case 'validator':
$load = array
(
- "js/jquery-2.1.4{$_type}",
+ "js/{$_jquery_core}{$_type}",
"validator/jquery.form-validator{$_type}"
// "validator/jquery.form-validator"
);
@@ -97,9 +105,8 @@
case 'autocomplete':
$load = array
(
- "js/jquery-2.1.4{$_type}",
- "js/jquery-ui-1.11.1{$_type}",
-// "js/jquery-migrate-1.2.1"
+ "js/{$_jquery_core}{$_type}",
+ "js/{$_jquery_ui}{$_type}",
);
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui-1.10.4.custom.css");
@@ -109,7 +116,7 @@
case 'tabview':
$load = array
(
- "js/jquery-2.1.4{$_type}",
+ "js/{$_jquery_core}{$_type}",
//
"tabs/jquery.responsiveTabs{$_type}",
"tabs/jquery.responsiveTabs",
'common'
@@ -122,7 +129,7 @@
case 'mmenu':
$load = array
(
- "js/jquery-2.1.4{$_type}",
+ "js/{$_jquery_core}{$_type}",
"mmenu/src/js/jquery.mmenu.min.all"
);
@@ -133,7 +140,7 @@
case 'treeview':
$load = array
(
- "js/jquery-2.1.4{$_type}",
+ "js/{$_jquery_core}{$_type}",
"treeview/jstree{$_type}"
);
@@ -144,7 +151,7 @@
case 'numberformat':
$load = array
(
- "js/jquery-2.1.4{$_type}",
+ "js/{$_jquery_core}{$_type}",
"number-format/jquery.number{$_type}"
);
@@ -152,8 +159,8 @@
case 'layout':
$load = array
(
- "js/jquery-2.1.4{$_type}",
- "js/jquery-ui-1.11.1{$_type}",
+ "js/{$_jquery_core}{$_type}",
+ "js/{$_jquery_ui}{$_type}",
'layout' =>
array("jquery.layout{$_type}", "plugins/jquery.layout.state")
);
break;
Modified: branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
2015-11-21 21:10:16 UTC (rev 14449)
+++ branches/dev-syncromind/phpgwapi/templates/pure/head.inc.php
2015-11-22 11:29:17 UTC (rev 14450)
@@ -97,7 +97,6 @@
'javascript' =>
$GLOBALS['phpgw']->common->get_javascript(),
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
'site_title' =>
"{$GLOBALS['phpgw_info']['server']['site_title']}",
- 'browser_not_supported' => lang('browser not
supported'),
'str_base_url' =>
$GLOBALS['phpgw']->link('/', array(), true),
'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
'win_on_events' =>
$GLOBALS['phpgw']->common->get_on_events(),
Modified: branches/dev-syncromind/phpgwapi/templates/pure/head.tpl
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/pure/head.tpl 2015-11-21
21:10:16 UTC (rev 14449)
+++ branches/dev-syncromind/phpgwapi/templates/pure/head.tpl 2015-11-22
11:29:17 UTC (rev 14450)
@@ -9,12 +9,6 @@
<meta name="keywords" content="phpGroupWare">
<meta name="robots" content="none">
<title>{site_title}</title>
- <script type="text/javascript">
- if(typeof(Storage)=="undefined")
- {
- alert('{browser_not_supported}');
- }
- </script>
{css}
<!-- BEGIN stylesheet -->
<link href="{stylesheet_uri}" type="text/css" rel="StyleSheet">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14450] add support for IE 6-8,
Sigurd Nes <=