[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15935] prepare for jquery 3
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15935] prepare for jquery 3 |
|
Date: |
Wed, 2 Nov 2016 08:01:23 +0000 (UTC) |
Revision: 15935
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15935
Author: sigurdne
Date: 2016-11-02 08:01:22 +0000 (Wed, 02 Nov 2016)
Log Message:
-----------
prepare for jquery 3
Modified Paths:
--------------
trunk/booking/js/booking/allocation.js
trunk/booking/js/booking/application.js
trunk/booking/js/booking/booking.js
trunk/booking/js/booking/email_send.js
trunk/booking/js/booking/event.js
trunk/booking/js/booking/report.js
trunk/booking/js/booking/season.js
trunk/booking/templates/base/building_schedule.xsl
trunk/booking/templates/base/massbooking_schedule.xsl
trunk/booking/templates/base/resource_schedule.xsl
trunk/booking/templates/base/season_wtemplate.xsl
trunk/bookingfrontend/js/bookingfrontend/application.js
trunk/bookingfrontend/js/bookingfrontend/booking.js
trunk/bookingfrontend/js/bookingfrontend/booking_massupdate.js
trunk/bookingfrontend/js/bookingfrontend/event.js
trunk/bookingfrontend/js/bookingfrontend/search.js
trunk/bookingfrontend/templates/base/building.xsl
trunk/bookingfrontend/templates/base/building_schedule.xsl
trunk/bookingfrontend/templates/base/resource.xsl
trunk/bookingfrontend/templates/base/resource_schedule.xsl
trunk/phpgwapi/inc/class.jquery.inc.php
trunk/property/js/portico/tts.view.js
trunk/rental/js/rental/schedule.js
trunk/rental/templates/base/application.xsl
trunk/rental/templates/base/schedule.xsl
Modified: trunk/booking/js/booking/allocation.js
===================================================================
--- trunk/booking/js/booking/allocation.js 2016-11-01 19:18:10 UTC (rev
15934)
+++ trunk/booking/js/booking/allocation.js 2016-11-02 08:01:22 UTC (rev
15935)
@@ -23,7 +23,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
if (building_id)
Modified: trunk/booking/js/booking/application.js
===================================================================
--- trunk/booking/js/booking/application.js 2016-11-01 19:18:10 UTC (rev
15934)
+++ trunk/booking/js/booking/application.js 2016-11-02 08:01:22 UTC (rev
15935)
@@ -79,7 +79,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
building_id = $('#field_building_id').val();
regulations_select_all = initialAcceptAllTerms;
Modified: trunk/booking/js/booking/booking.js
===================================================================
--- trunk/booking/js/booking/booking.js 2016-11-01 19:18:10 UTC (rev 15934)
+++ trunk/booking/js/booking/booking.js 2016-11-02 08:01:22 UTC (rev 15935)
@@ -88,7 +88,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
var organization_id = $('#field_org_id').val();
Modified: trunk/booking/js/booking/email_send.js
===================================================================
--- trunk/booking/js/booking/email_send.js 2016-11-01 19:18:10 UTC (rev
15934)
+++ trunk/booking/js/booking/email_send.js 2016-11-02 08:01:22 UTC (rev
15935)
@@ -7,7 +7,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
building_id = $('#field_building_id').val();
if (building_id)
Modified: trunk/booking/js/booking/event.js
===================================================================
--- trunk/booking/js/booking/event.js 2016-11-01 19:18:10 UTC (rev 15934)
+++ trunk/booking/js/booking/event.js 2016-11-02 08:01:22 UTC (rev 15935)
@@ -73,7 +73,7 @@
});
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
if (building_id)
Modified: trunk/booking/js/booking/report.js
===================================================================
--- trunk/booking/js/booking/report.js 2016-11-01 19:18:10 UTC (rev 15934)
+++ trunk/booking/js/booking/report.js 2016-11-02 08:01:22 UTC (rev 15935)
@@ -6,7 +6,7 @@
JqueryPortico.autocompleteHelper(requestUrl, 'field_building_name',
'field_building_id', 'building_container');
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
if (building_id > 0)
Modified: trunk/booking/js/booking/season.js
===================================================================
--- trunk/booking/js/booking/season.js 2016-11-01 19:18:10 UTC (rev 15934)
+++ trunk/booking/js/booking/season.js 2016-11-02 08:01:22 UTC (rev 15935)
@@ -9,7 +9,7 @@
'field_building_name', 'field_building_id',
'building_container');
});
-$(window).load(function ()
+$(window).on('load', function()
{
building_id = $('#field_building_id').val();
if (building_id)
Modified: trunk/booking/templates/base/building_schedule.xsl
===================================================================
--- trunk/booking/templates/base/building_schedule.xsl 2016-11-01 19:18:10 UTC
(rev 15934)
+++ trunk/booking/templates/base/building_schedule.xsl 2016-11-02 08:01:22 UTC
(rev 15935)
@@ -46,7 +46,7 @@
</div>
</form>
<script type="text/javascript">
- $(window).load(function() {
+ $(window).on('load', function() {
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
schedule.includeResource = true;
Modified: trunk/booking/templates/base/massbooking_schedule.xsl
===================================================================
--- trunk/booking/templates/base/massbooking_schedule.xsl 2016-11-01
19:18:10 UTC (rev 15934)
+++ trunk/booking/templates/base/massbooking_schedule.xsl 2016-11-02
08:01:22 UTC (rev 15935)
@@ -55,7 +55,7 @@
schedule.createDialogSchedule(300);
- $(window).load(function() {
+ $(window).on('load', function() {
$('body').prepend($('#content_overlay'));
schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
schedule.newApplicationUrl = '<xsl:value-of
select="building/application_link"/>';
Modified: trunk/booking/templates/base/resource_schedule.xsl
===================================================================
--- trunk/booking/templates/base/resource_schedule.xsl 2016-11-01 19:18:10 UTC
(rev 15934)
+++ trunk/booking/templates/base/resource_schedule.xsl 2016-11-02 08:01:22 UTC
(rev 15935)
@@ -46,7 +46,7 @@
</div>
</form>
<script type="text/javascript">
- $(window).load(function() {
+ $(window).on('load', function() {
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="resource/datasource_url"/>';
schedule.newApplicationUrl = '<xsl:value-of
select="resource/application_link"/>';
Modified: trunk/booking/templates/base/season_wtemplate.xsl
===================================================================
--- trunk/booking/templates/base/season_wtemplate.xsl 2016-11-01 19:18:10 UTC
(rev 15934)
+++ trunk/booking/templates/base/season_wtemplate.xsl 2016-11-02 08:01:22 UTC
(rev 15935)
@@ -94,7 +94,7 @@
var weekUrl =
'index.php?menuaction=booking.uiseason.wtemplate_json&id=' + season_id +
'&phpgw_return_as=json&';
]]>
var colDefs = [];
- $(window).load(function() {
+ $(window).on('load', function() {
colDefs = [
{key: 'time', label: '<xsl:value-of
select="php:function('lang', 'Time')" />', type: 'th'},
{key: 'resource', label: '<xsl:value-of
select="php:function('lang', 'Resources')" />', formatter:
'scheduleResourceColumn'},
Modified: trunk/bookingfrontend/js/bookingfrontend/application.js
===================================================================
--- trunk/bookingfrontend/js/bookingfrontend/application.js 2016-11-01
19:18:10 UTC (rev 15934)
+++ trunk/bookingfrontend/js/bookingfrontend/application.js 2016-11-02
08:01:22 UTC (rev 15935)
@@ -77,7 +77,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
building_id = $('#field_building_id').val();
regulations_select_all = initialAcceptAllTerms;
Modified: trunk/bookingfrontend/js/bookingfrontend/booking.js
===================================================================
--- trunk/bookingfrontend/js/bookingfrontend/booking.js 2016-11-01 19:18:10 UTC
(rev 15934)
+++ trunk/bookingfrontend/js/bookingfrontend/booking.js 2016-11-02 08:01:22 UTC
(rev 15935)
@@ -59,7 +59,7 @@
});
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
var organization_id = $('#field_org_id').val();
Modified: trunk/bookingfrontend/js/bookingfrontend/booking_massupdate.js
===================================================================
--- trunk/bookingfrontend/js/bookingfrontend/booking_massupdate.js
2016-11-01 19:18:10 UTC (rev 15934)
+++ trunk/bookingfrontend/js/bookingfrontend/booking_massupdate.js
2016-11-02 08:01:22 UTC (rev 15935)
@@ -1,4 +1,4 @@
-$(window).load(function ()
+$(window).on('load', function()
{
$('header').hide();
Modified: trunk/bookingfrontend/js/bookingfrontend/event.js
===================================================================
--- trunk/bookingfrontend/js/bookingfrontend/event.js 2016-11-01 19:18:10 UTC
(rev 15934)
+++ trunk/bookingfrontend/js/bookingfrontend/event.js 2016-11-02 08:01:22 UTC
(rev 15935)
@@ -52,7 +52,7 @@
});
});
-$(window).load(function ()
+$(window).on('load', function()
{
var building_id = $('#field_building_id').val();
if (building_id)
Modified: trunk/bookingfrontend/js/bookingfrontend/search.js
===================================================================
--- trunk/bookingfrontend/js/bookingfrontend/search.js 2016-11-01 19:18:10 UTC
(rev 15934)
+++ trunk/bookingfrontend/js/bookingfrontend/search.js 2016-11-02 08:01:22 UTC
(rev 15935)
@@ -257,7 +257,7 @@
});
-$(window).load(function ()
+$(window).on('load', function()
{
$("#field_building_name").on("autocompleteselect", function (event, ui)
{
Modified: trunk/bookingfrontend/templates/base/building.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/building.xsl 2016-11-01 19:18:10 UTC
(rev 15934)
+++ trunk/bookingfrontend/templates/base/building.xsl 2016-11-02 08:01:22 UTC
(rev 15935)
@@ -160,7 +160,7 @@
createTable('documents_container', documentURL,
colDefsDocument);
createTable('building_users_container',
building_usersURL, colDefsBuilding_users, rBuilding_users, '',
paginatorTableBuilding_users);
- $(window).load(function(){
+ $(window).on('load', function(){
// Load image
JqueryPortico.booking.inlineImages('images_container', document_buildingURL);
Modified: trunk/bookingfrontend/templates/base/building_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/building_schedule.xsl 2016-11-01
19:18:10 UTC (rev 15934)
+++ trunk/bookingfrontend/templates/base/building_schedule.xsl 2016-11-02
08:01:22 UTC (rev 15935)
@@ -57,7 +57,7 @@
<script type="text/javascript">
schedule.createDialogSchedule(300);
- $(window).load(function() {
+ $(window).on('load', function() {
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="building/datasource_url"/>';
schedule.newApplicationUrl = '<xsl:value-of
select="building/application_link"/>';
Modified: trunk/bookingfrontend/templates/base/resource.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/resource.xsl 2016-11-01 19:18:10 UTC
(rev 15934)
+++ trunk/bookingfrontend/templates/base/resource.xsl 2016-11-02 08:01:22 UTC
(rev 15935)
@@ -92,7 +92,7 @@
var colDefsDocumentsResource = [{key: 'name', label:
lang['Name'], formatter: genericLink}];
createTable('documents_container', documentsResourceURL,
colDefsDocumentsResource);
- $(window).load(function(){
+ $(window).on('load', function(){
JqueryPortico.booking.inlineImages('images_container',
documentsResourceImagesURL);
// Load Google map
Modified: trunk/bookingfrontend/templates/base/resource_schedule.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/resource_schedule.xsl 2016-11-01
19:18:10 UTC (rev 15934)
+++ trunk/bookingfrontend/templates/base/resource_schedule.xsl 2016-11-02
08:01:22 UTC (rev 15935)
@@ -58,7 +58,7 @@
<script type="text/javascript">
schedule.createDialogSchedule(300);
- $(window).load(function(){
+ $(window).on('load', function(){
schedule.setupWeekPicker('cal_container');
schedule.datasourceUrl = '<xsl:value-of
select="resource/datasource_url" />';
schedule.newApplicationUrl = '<xsl:value-of
select="resource/application_link" />';
Modified: trunk/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jquery.inc.php 2016-11-01 19:18:10 UTC (rev
15934)
+++ trunk/phpgwapi/inc/class.jquery.inc.php 2016-11-02 08:01:22 UTC (rev
15935)
@@ -57,7 +57,7 @@
else
{
$_jquery_core = 'jquery-2.1.4';
- $_jquery_core = 'jquery-3.1.1';
+ // $_jquery_core = 'jquery-3.1.1';
}
// $_jquery_ui = 'jquery-ui-1.11.4';
Modified: trunk/property/js/portico/tts.view.js
===================================================================
--- trunk/property/js/portico/tts.view.js 2016-11-01 19:18:10 UTC (rev
15934)
+++ trunk/property/js/portico/tts.view.js 2016-11-02 08:01:22 UTC (rev
15935)
@@ -360,7 +360,7 @@
var ecodimb_selection = "";
-$(window).load(function ()
+$(window).on('load', function()
{
ecodimb = $('#ecodimb').val();
if (ecodimb)
Modified: trunk/rental/js/rental/schedule.js
===================================================================
--- trunk/rental/js/rental/schedule.js 2016-11-01 19:18:10 UTC (rev 15934)
+++ trunk/rental/js/rental/schedule.js 2016-11-02 08:01:22 UTC (rev 15935)
@@ -174,7 +174,7 @@
}
}
-$(window).load(function()
+$(window).on('load', function()
{
function searchSchedule ()
{
Modified: trunk/rental/templates/base/application.xsl
===================================================================
--- trunk/rental/templates/base/application.xsl 2016-11-01 19:18:10 UTC (rev
15934)
+++ trunk/rental/templates/base/application.xsl 2016-11-02 08:01:22 UTC (rev
15935)
@@ -450,7 +450,7 @@
var
application_id = $('#application_id').val();
schedule.rental
= {};
-
$(window).load(function() {
+
$(window).on('load', function() {
schedule.params.length = $('#cboNObjects').val();
schedule.params.search = $('#txtSearchSchedule').val();
Modified: trunk/rental/templates/base/schedule.xsl
===================================================================
--- trunk/rental/templates/base/schedule.xsl 2016-11-01 19:18:10 UTC (rev
15934)
+++ trunk/rental/templates/base/schedule.xsl 2016-11-02 08:01:22 UTC (rev
15935)
@@ -13,7 +13,7 @@
<script type="text/javascript">
var composite_id = '<xsl:value-of
select="schedule/composite_id"/>';
schedule.rental = {};
- $(window).load(function() {
+ $(window).on('load', function() {
schedule.params.length = $('#cboNObjects').val();
schedule.params.search = $('#txtSearchSchedule').val();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15935] prepare for jquery 3,
sigurdne <=