[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15951] clean up old jquery
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15951] clean up old jquery |
|
Date: |
Fri, 4 Nov 2016 09:41:08 +0000 (UTC) |
Revision: 15951
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15951
Author: sigurdne
Date: 2016-11-04 09:41:08 +0000 (Fri, 04 Nov 2016)
Log Message:
-----------
clean up old jquery
Modified Paths:
--------------
trunk/booking/inc/class.uicommon.inc.php
trunk/eventplanner/inc/class.uiapplication.inc.php
trunk/logistic/inc/class.uiactivity.inc.php
trunk/logistic/inc/class.uirequirement.inc.php
trunk/phpgwapi/inc/class.jqcal.inc.php
trunk/phpgwapi/inc/class.jquery.inc.php
trunk/phpgwapi/js/SlickNav/demo/index.html
trunk/rental/inc/class.uiapplication.inc.php
Modified: trunk/booking/inc/class.uicommon.inc.php
===================================================================
--- trunk/booking/inc/class.uicommon.inc.php 2016-11-04 08:20:38 UTC (rev
15950)
+++ trunk/booking/inc/class.uicommon.inc.php 2016-11-04 09:41:08 UTC (rev
15951)
@@ -718,19 +718,19 @@
{
$theme = 'ui-lightness';
}
-// $theme = 'ui-lightness';
-
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui-1.10.4.custom.css");
+ $theme = 'redmond';
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui.min.css");
switch ($type)
{
case 'datetime':
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/jquery-ui-timepicker-addon.css");
-
$GLOBALS['phpgw']->js->validate_file('jquery', 'js/jquery-ui-timepicker-addon');
+
$GLOBALS['phpgw']->js->validate_file('jquery',
'js/jquery-ui-timepicker-addon.min');
$_type = 'datetime';
break;
case 'time':
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/jquery-ui-timepicker-addon.css");
-
$GLOBALS['phpgw']->js->validate_file('jquery', 'js/jquery-ui-timepicker-addon');
+
$GLOBALS['phpgw']->js->validate_file('jquery',
'js/jquery-ui-timepicker-addon.min');
$_type = 'time';
break;
default:
Modified: trunk/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uiapplication.inc.php 2016-11-04 08:20:38 UTC
(rev 15950)
+++ trunk/eventplanner/inc/class.uiapplication.inc.php 2016-11-04 09:41:08 UTC
(rev 15951)
@@ -340,8 +340,8 @@
array('disablePagination' => true)
)
);
- $GLOBALS['phpgw']->jqcal->add_listener('from_',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('to_',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('from_',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('to_',
'datetime');
$application_type_list =
execMethod('eventplanner.bogeneric.get_list', array('type' =>
'application_type'));
$types = (array)$application->types;
Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2016-11-04 08:20:38 UTC (rev
15950)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2016-11-04 09:41:08 UTC (rev
15951)
@@ -487,8 +487,8 @@
$this->rich_text_editor('description');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('logistic') . '::' . lang('Add activity');
- $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('start_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('end_date',
'datetime');
self::add_javascript('logistic', 'logistic',
'activity.js');
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
Modified: trunk/logistic/inc/class.uirequirement.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement.inc.php 2016-11-04 08:20:38 UTC
(rev 15950)
+++ trunk/logistic/inc/class.uirequirement.inc.php 2016-11-04 09:41:08 UTC
(rev 15951)
@@ -526,8 +526,8 @@
$data['activity'] = $activity;
}
- $GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('start_date',
'datetime');
+ $GLOBALS['phpgw']->jqcal2->add_listener('end_date',
'datetime');
self::render_template_xsl(array('requirement/requirement_tabs',
'requirement/requirement_item'), $data);
}
Modified: trunk/phpgwapi/inc/class.jqcal.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jqcal.inc.php 2016-11-04 08:20:38 UTC (rev
15950)
+++ trunk/phpgwapi/inc/class.jqcal.inc.php 2016-11-04 09:41:08 UTC (rev
15951)
@@ -42,12 +42,12 @@
{
case 'datetime':
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/jquery-ui-timepicker-addon.css");
-
$GLOBALS['phpgw']->js->validate_file('jquery', 'js/jquery-ui-timepicker-addon');
+
$GLOBALS['phpgw']->js->validate_file('jquery',
'js/jquery-ui-timepicker-addon.min');
$_type = 'datetime';
break;
case 'time':
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/jquery-ui-timepicker-addon.css");
-
$GLOBALS['phpgw']->js->validate_file('jquery', 'js/jquery-ui-timepicker-addon');
+
$GLOBALS['phpgw']->js->validate_file('jquery',
'js/jquery-ui-timepicker-addon.min');
$_type = 'time';
break;
default:
Modified: trunk/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jquery.inc.php 2016-11-04 08:20:38 UTC (rev
15950)
+++ trunk/phpgwapi/inc/class.jquery.inc.php 2016-11-04 09:41:08 UTC (rev
15951)
@@ -67,7 +67,6 @@
$_jquery_migrate = 'jquery-migrate-3.0.0.min';
}
- // $_jquery_ui = 'jquery-ui-1.11.4';
$_jquery_ui = 'jquery-ui-1.12.1';
$_type = '.min'; // save some download
@@ -93,9 +92,9 @@
(
"js/{$_jquery_core}{$_type}",
"js/{$_jquery_ui}{$_type}",
-
"development-bundle/ui/i18n/jquery.ui.datepicker-{$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']}",
+
"ui/i18n/datepicker-{$GLOBALS['phpgw_info']['user']['preferences']['common']['lang']}",
);
-
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui-1.12.1.min.css");
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui.min.css");
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/jquery-ui-timepicker-addon.css");
break;
@@ -129,7 +128,7 @@
"js/{$_jquery_ui}{$_type}",
);
-
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui-1.12.1.min.css");
+
$GLOBALS['phpgw']->css->add_external_file("phpgwapi/js/jquery/css/{$theme}/jquery-ui.min.css");
break;
Modified: trunk/phpgwapi/js/SlickNav/demo/index.html
===================================================================
--- trunk/phpgwapi/js/SlickNav/demo/index.html 2016-11-04 08:20:38 UTC (rev
15950)
+++ trunk/phpgwapi/js/SlickNav/demo/index.html 2016-11-04 09:41:08 UTC (rev
15951)
@@ -40,7 +40,7 @@
</li>
</ul>
-<script src="../../jquery/js/jquery-1.11.1.min.js"></script>
+<script src="../../jquery/js/jquery-1.11.3.min.js"></script>
<script src="../jquery.slicknav.js"></script>
<script type="text/javascript">
$(document).ready(function(){
Modified: trunk/rental/inc/class.uiapplication.inc.php
===================================================================
--- trunk/rental/inc/class.uiapplication.inc.php 2016-11-04 08:20:38 UTC
(rev 15950)
+++ trunk/rental/inc/class.uiapplication.inc.php 2016-11-04 09:41:08 UTC
(rev 15951)
@@ -312,10 +312,10 @@
$bocommon = CreateObject('property.bocommon');
-
$GLOBALS['phpgw']->jqcal->add_listener('date_start','datetime');
-
$GLOBALS['phpgw']->jqcal->add_listener('date_end','datetime');
-
$GLOBALS['phpgw']->jqcal->add_listener('assign_date_start','datetime');
-
$GLOBALS['phpgw']->jqcal->add_listener('assign_date_end','datetime');
+
$GLOBALS['phpgw']->jqcal2->add_listener('date_start','datetime');
+
$GLOBALS['phpgw']->jqcal2->add_listener('date_end','datetime');
+
$GLOBALS['phpgw']->jqcal2->add_listener('assign_date_start','datetime');
+
$GLOBALS['phpgw']->jqcal2->add_listener('assign_date_end','datetime');
$accounts =
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_EDIT,
$this->acl_location, 'rental');
$executive_officer_options[] = array('id' => '', 'name'
=> lang('nobody'), 'selected' => 0);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15951] clean up old jquery,
sigurdne <=