Commit 64cf6a4b authored by Jonny Bradley's avatar Jonny Bradley

[UPD] Update jquery to 2.2.0, jquery-ui to 1.11.4 and jquery-migrate to 1.3.0...

[UPD] Update jquery to 2.2.0, jquery-ui to 1.11.4 and jquery-migrate to 1.3.0 (and make a new header var for the migrate version)
Seems ok... keep an eye out for js errors please
parent 5efe97a7
......@@ -26,12 +26,12 @@
"ezyang/htmlpurifier": "4.6.0",
"google/apiclient":"1.1.6",
"jcapture-applet/jcapture-applet": "dev-master",
"jquery/jquery": "1.11.2",
"jquery/jquery-min": "1.11.2",
"jquery/jquery": "2.2.0",
"jquery/jquery-min": "2.2.0",
"jquery/jquery-s5": "1.0.1",
"jquery/jquery-sheet": "3.1",
"jquery/jquery-ui": "1.11.3",
"jquery/jquery-ui-themes": "1.11.3",
"jquery/jquery-ui": "1.11.4",
"jquery/jquery-ui-themes": "1.11.4",
"jquery/jquery-timepicker-addon": "1.5.0",
"jquery/jtrack": "1.0",
"jquery/minicart": "2.6.1",
......@@ -48,7 +48,7 @@
"jquery/plugins/jquery-validation": "1.13.1",
"jquery/plugins/jquery-json": "2.5.1",
"jquery/plugins/media": "0.98",
"jquery/plugins/migrate": "1.2.1",
"jquery/plugins/migrate": "1.3.0",
"jquery/plugins/migrate-min": "1.2.1",
"jquery/plugins/nestedsortable": "1.3.4",
"jquery/plugins/reflection-jquery": "1.1",
......
......@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "15bb9ecad65b37802236565d2ee65cd4",
"content-hash": "41f7ba873177f2a30ce8ce59c1e5b6a0",
"hash": "bfd4d9e8cfb0fc6b850ce9b1cee2ae1d",
"content-hash": "35102cf240a59554e494ec4a936378b2",
"packages": [
{
"name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
......@@ -628,23 +628,23 @@
},
{
"name": "jquery/jquery",
"version": "1.11.2",
"version": "2.2.0",
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-1.11.2.zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-2.2.0.zip",
"reference": null,
"shasum": "52938ef9c9c501fb9054e79a8a9e335656640385"
"shasum": "61f9e3c849159d7a20877c5616853c952c278b8d"
},
"type": "library"
},
{
"name": "jquery/jquery-min",
"version": "1.11.2",
"version": "2.2.0",
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-min-1.11.2.zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-min-2.2.0.zip",
"reference": null,
"shasum": "66a5a528ea4c344cfd41c4a4adf51e1a1e156c0c"
"shasum": "6e61221ff6dc79962f154472237e3e94f87985e2"
},
"type": "library"
},
......@@ -683,23 +683,23 @@
},
{
"name": "jquery/jquery-ui",
"version": "1.11.3",
"version": "1.11.4",
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-ui-1.11.3.zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-ui-1.11.4.zip",
"reference": null,
"shasum": "8be2cccc3c7eab3932cdd421c788d5cbb7ab2e32"
"shasum": "2f5e1cfb9b8528547e4b7887205294e1973d6848"
},
"type": "library"
},
{
"name": "jquery/jquery-ui-themes",
"version": "1.11.3",
"version": "1.11.4",
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-ui-themes-1.11.3.zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-ui-themes-1.11.4.zip",
"reference": null,
"shasum": "24b728fe71be80739d33658fa589b9b64562b006"
"shasum": "edf7d9142d82c8931c335d4198667a634bc7d5ea"
},
"type": "library"
},
......@@ -870,12 +870,12 @@
},
{
"name": "jquery/plugins/migrate",
"version": "1.2.1",
"version": "1.3.0",
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-migrate-1.2.1.zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-migrate-1.3.0.zip",
"reference": null,
"shasum": "65ba8fe28839299fbf66b92c67b984c39fb31b1e"
"shasum": "6478ba95f12bf423525409a118e3738290a29261"
},
"type": "library"
},
......
......@@ -117,9 +117,9 @@ class HeaderLib
public $forceJsRankLate;
public $jquery_version = '1.11.2';
public $jqueryui_version = '1.11.3';
public $jquerymobile_version = '1.3.2';
public $jquery_version = '2.2.0';
public $jqueryui_version = '1.11.4';
public $jquerymigrate_version = '1.3.0';
function __construct()
......
......@@ -334,22 +334,22 @@ if ( $prefs['rating_advanced'] == 'y' && $prefs['rating_recalculation'] == 'rand
$headerlib->add_jsfile('lib/tiki-js.js');
// using jquery-migrate-1.2.1.js plugin for tiki 11, still required in tiki 12 LTS to support some 3rd party plugins
// using jquery-migrate-1.3.0.js plugin for tiki 11, still required in tiki 12 LTS to support some 3rd party plugins
if ( isset($prefs['javascript_cdn']) && $prefs['javascript_cdn'] == 'google' ) {
$headerlib->add_jsfile_cdn("$url_scheme://ajax.googleapis.com/ajax/libs/jquery/$headerlib->jquery_version/jquery.min.js");
// goggle is not hosting migrate so load from local
$headerlib->add_jsfile_dependancy("vendor/jquery/plugins/migrate-min/jquery-migrate-1.2.1.min.js", true);
$headerlib->add_jsfile_dependancy("vendor/jquery/plugins/migrate-min/jquery-migrate-$headerlib->jquerymigrate_version.min.js", true);
} else if ( isset($prefs['javascript_cdn']) && $prefs['javascript_cdn'] == 'jquery' ) {
$headerlib->add_jsfile_cdn("$url_scheme://code.jquery.com/jquery-$headerlib->jquery_version.min.js");
$headerlib->add_jsfile_cdn("$url_scheme://code.jquery.com/jquery-migrate-1.2.1.min.js");
$headerlib->add_jsfile_cdn("$url_scheme://code.jquery.com/jquery-migrate-$headerlib->jquerymigrate_version.min.js");
} else {
if ( isset($prefs['tiki_minify_javascript']) && $prefs['tiki_minify_javascript'] === 'y' ) {
$headerlib->add_jsfile_dependancy("vendor/jquery/jquery-min/jquery-$headerlib->jquery_version.min.js", true);
$headerlib->add_jsfile_dependancy("vendor/jquery/plugins/migrate-min/jquery-migrate-1.2.1.min.js", true);
$headerlib->add_jsfile_dependancy("vendor/jquery/plugins/migrate-min/jquery-migrate-$headerlib->jquerymigrate_version.min.js", true);
} else {
$headerlib->add_jsfile_dependancy("vendor/jquery/jquery/jquery-$headerlib->jquery_version.js", true);
$headerlib->add_jsfile_dependancy("vendor/jquery/plugins/migrate/jquery-migrate-1.2.1.js", true);
$headerlib->add_jsfile_dependancy("vendor/jquery/plugins/migrate/jquery-migrate-$headerlib->jquerymigrate_version.js", true);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment