[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15937] prepare for jquery 3
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15937] prepare for jquery 3 |
|
Date: |
Wed, 2 Nov 2016 11:29:45 +0000 (UTC) |
Revision: 15937
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15937
Author: sigurdne
Date: 2016-11-02 11:29:45 +0000 (Wed, 02 Nov 2016)
Log Message:
-----------
prepare for jquery 3
Modified Paths:
--------------
trunk/controller/js/controller/ajax.js
trunk/controller/js/controller/ajax_control_to_component.js
trunk/controller/js/controller/ajax_control_to_location.js
trunk/controller/js/controller/case.js
trunk/controller/js/controller/check_list_update_status.js
trunk/phpgwapi/inc/class.jquery.inc.php
trunk/rental/js/rental/application.edit.js
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2016-11-02 08:43:03 UTC (rev
15936)
+++ trunk/controller/js/controller/ajax.js 2016-11-02 11:29:45 UTC (rev
15937)
@@ -54,7 +54,7 @@
{
if (data != null)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -100,7 +100,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontroll</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -146,7 +146,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontrollgruppe</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -183,7 +183,7 @@
{
if (data != null)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -222,7 +222,7 @@
if (data != null)
{
htmlString = "<option>Velg
type</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -262,7 +262,7 @@
if (data != null)
{
htmlString = "<option>Velg
prosedyre</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -304,7 +304,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontrollgruppe</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -732,7 +732,7 @@
{
if (data)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
// Show info box with info about check
list
var infoBox =
$(divWrp).find("#info_box");
Modified: trunk/controller/js/controller/ajax_control_to_component.js
===================================================================
--- trunk/controller/js/controller/ajax_control_to_component.js 2016-11-02
08:43:03 UTC (rev 15936)
+++ trunk/controller/js/controller/ajax_control_to_component.js 2016-11-02
11:29:45 UTC (rev 15937)
@@ -23,7 +23,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontroll</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -161,7 +161,7 @@
{
if (data != null)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
Modified: trunk/controller/js/controller/ajax_control_to_location.js
===================================================================
--- trunk/controller/js/controller/ajax_control_to_location.js 2016-11-02
08:43:03 UTC (rev 15936)
+++ trunk/controller/js/controller/ajax_control_to_location.js 2016-11-02
11:29:45 UTC (rev 15937)
@@ -23,7 +23,7 @@
if (data != null)
{
htmlString = "<option>Velg
kontroll</option>"
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
@@ -124,7 +124,7 @@
{
if (data != null)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i)
{
Modified: trunk/controller/js/controller/case.js
===================================================================
--- trunk/controller/js/controller/case.js 2016-11-02 08:43:03 UTC (rev
15936)
+++ trunk/controller/js/controller/case.js 2016-11-02 11:29:45 UTC (rev
15937)
@@ -37,7 +37,7 @@
{
if (data)
{
- var jsonObj =
jQuery.parseJSON(data);
+ var jsonObj = JSON.parse(data);
if (jsonObj.status == "saved")
{
@@ -86,7 +86,7 @@
{
if (data != null)
{
- var obj =
jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
$.each(obj, function (i,
control_group)
{
@@ -148,7 +148,7 @@
{
if (data)
{
- var jsonObj = jQuery.parseJSON(data);
+ var jsonObj = JSON.parse(data);
if (jsonObj.status == "saved")
{
@@ -240,7 +240,7 @@
url: url,
success: function (data)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
if (obj.status == "deleted")
{
@@ -290,7 +290,7 @@
url: url,
success: function (data)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
if (obj.status == "true")
{
@@ -340,7 +340,7 @@
url: url,
success: function (data)
{
- var obj = jQuery.parseJSON(data);
+ var obj = JSON.parse(data);
if (obj.status == "true")
{
Modified: trunk/controller/js/controller/check_list_update_status.js
===================================================================
--- trunk/controller/js/controller/check_list_update_status.js 2016-11-02
08:43:03 UTC (rev 15936)
+++ trunk/controller/js/controller/check_list_update_status.js 2016-11-02
11:29:45 UTC (rev 15937)
@@ -21,7 +21,7 @@
{
if (data)
{
- var jsonObj = jQuery.parseJSON(data);
+ var jsonObj = JSON.parse(data);
if (jsonObj.status == 'not_saved')
{
Modified: trunk/phpgwapi/inc/class.jquery.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.jquery.inc.php 2016-11-02 08:43:03 UTC (rev
15936)
+++ trunk/phpgwapi/inc/class.jquery.inc.php 2016-11-02 11:29:45 UTC (rev
15937)
@@ -50,14 +50,18 @@
*/
public static function load_widget( $widget )
{
+ $migration_test = true;
+
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.
+ $_jquery_migrate = 'jquery-migrate-1.4.1.min';
}
else
{
- $_jquery_core = 'jquery-2.1.4';
- // $_jquery_core = 'jquery-3.1.1';
+ // $_jquery_core = 'jquery-2.1.4';
+ $_jquery_core = 'jquery-3.1.1';
+ $_jquery_migrate = 'jquery-migrate-3.0.0.min';
}
// $_jquery_ui = 'jquery-ui-1.11.4';
@@ -76,8 +80,7 @@
switch ($widget)
{
case 'core':
- $load = array
- (
+ $load = array(
"js/{$_jquery_core}{$_type}",
);
break;
@@ -257,6 +260,12 @@
}
}
}
+ if($migration_test)
+ {
+ //_debug_array($_jquery_migrate);
+ $GLOBALS['phpgw']->js->validate_file('jquery',
"js/$_jquery_migrate");
+ }
+
return "phpgroupware.{$widget}" . ++self::$counter;
}
Modified: trunk/rental/js/rental/application.edit.js
===================================================================
--- trunk/rental/js/rental/application.edit.js 2016-11-02 08:43:03 UTC (rev
15936)
+++ trunk/rental/js/rental/application.edit.js 2016-11-02 11:29:45 UTC (rev
15937)
@@ -35,7 +35,7 @@
function reserveComposite (data, button)
{
button.disabled = true;
- data = jQuery.parseJSON(data);
+ data = JSON.parse(data);
var url = data['url'];
var application_id = $('#application_id').val();
@@ -55,7 +55,7 @@
function removeComposite (data, button)
{
button.disabled = true;
- data = jQuery.parseJSON(data);
+ data = JSON.parse(data);
var url = data['url'];
var application_id = $('#application_id').val();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15937] prepare for jquery 3,
sigurdne <=