Commit 57eafd8c authored by Jonny Bradley's avatar Jonny Bradley

[UPD] jquery from 2.x to 3.x latest (and jquery-migrate to 3.0) - a few new...

[UPD] jquery from 2.x to 3.x latest (and jquery-migrate to 3.0) - a few new migrate notices but most things seem to work, please report any borkages
parent f7216367
......@@ -18,14 +18,14 @@
"ckeditor/ckeditor/skins/bootstrapck": "^1",
"ckeditor/ckeditor/skins/minimalist": "^1",
"codemirror/codemirror": "4.12.0",
"components/jquery": "^3.1.0",
"components/jquery-migrate": "^3.0.0",
"cwspear/bootstrap-hover-dropdown": "^2.2.1",
"dompdf/dompdf": "0.6.1",
"ezyang/htmlpurifier": "^4.8.0",
"fortawesome/font-awesome": "^4.6.3",
"google/apiclient":"1.1.6",
"jcapture-applet/jcapture-applet": "dev-master",
"jquery/jquery": "2.2.2",
"jquery/jquery-min": "2.2.2",
"jquery/jquery-s5": "1.0.1",
"jquery/jquery-sheet": "3.1",
"jquery/jquery-ui": "1.11.4",
......@@ -46,8 +46,6 @@
"jquery/plugins/jquery-validation": "1.13.1",
"jquery/plugins/jquery-json": "2.5.1",
"jquery/plugins/media": "0.98",
"jquery/plugins/migrate": "1.4.0",
"jquery/plugins/migrate-min": "1.4.0",
"jquery/plugins/nestedsortable": "1.3.4",
"jquery/plugins/reflection-jquery": "1.1",
"jquery/plugins/superfish": "1.7.5",
......
......@@ -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": "ed1be02ae749d7c43648995296533498",
"content-hash": "87c3a9dae7cc1b26fbd7cdeaf3249425",
"hash": "3e27db9cdd489bb05b4a0cdb64699bf6",
"content-hash": "22623eb3f9eae8b9796fcd6d0011090d",
"packages": [
{
"name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
......@@ -320,17 +320,17 @@
},
{
"name": "components/jquery",
"version": "3.1.0",
"version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/components/jquery.git",
"reference": "39192bee49ceb98f36e9592ee2fc5116a414b6cc"
"reference": "09a1658378bc1f818856086396ebeab7d0ec2276"
},
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/components-jquery-39192bee49ceb98f36e9592ee2fc5116a414b6cc-zip-92b012.zip",
"reference": "39192bee49ceb98f36e9592ee2fc5116a414b6cc",
"shasum": "566e31c223ecc4c86b91c50f0667100705a2912e"
"url": "https://composer.tiki.org/dist/components-jquery-09a1658378bc1f818856086396ebeab7d0ec2276-zip-4b88ad.zip",
"reference": "09a1658378bc1f818856086396ebeab7d0ec2276",
"shasum": "8917d60095ffc90324f58c9c7d18c0ba23dd1bfe"
},
"type": "component",
"extra": {
......@@ -356,7 +356,46 @@
],
"description": "jQuery JavaScript Library",
"homepage": "http://jquery.com",
"time": "2016-07-08 05:56:55"
"time": "2016-09-23 06:06:29"
},
{
"name": "components/jquery-migrate",
"version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/components/jquery-migrate.git",
"reference": "349e64504a30bf9969c7723711bb5bb707adf450"
},
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/components-jquery-migrate-349e64504a30bf9969c7723711bb5bb707adf450-zip-5de248.zip",
"reference": "349e64504a30bf9969c7723711bb5bb707adf450",
"shasum": "dafc5a48f8730c95d83289cab165f76da822e3fd"
},
"type": "component",
"extra": {
"component": {
"scripts": [
"jquery-migrate.js"
],
"files": [
"jquery-migrate.min.js"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "jQuery Foundation and other contributors",
"homepage": "https://github.com/jquery/jquery-migrate/blob/master/AUTHORS.txt"
}
],
"description": "APIs and features removed from jQuery core",
"homepage": "https://github.com/jquery/jquery-migrate",
"time": "2016-06-14 06:48:05"
},
{
"name": "container-interop/container-interop",
......@@ -651,28 +690,6 @@
],
"time": "2014-01-27 14:02:15"
},
{
"name": "jquery/jquery",
"version": "2.2.2",
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-2.2.2.zip",
"reference": null,
"shasum": "3e667e95b47ffe265c36d6ec4d68d276228fad5f"
},
"type": "library"
},
{
"name": "jquery/jquery-min",
"version": "2.2.2",
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-min-2.2.2.zip",
"reference": null,
"shasum": "e31d434e8163eed24283bf3f1c3cb6244839a66d"
},
"type": "library"
},
{
"name": "jquery/jquery-s5",
"version": "1.0.1",
......@@ -893,28 +910,6 @@
},
"type": "library"
},
{
"name": "jquery/plugins/migrate",
"version": "1.4.0",
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-migrate-1.4.0.zip",
"reference": null,
"shasum": "2ea30f734e4b0603bf4cb8acf2c17ee53eabc979"
},
"type": "library"
},
{
"name": "jquery/plugins/migrate-min",
"version": "1.4.0",
"dist": {
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-migrate-min-1.4.0.zip",
"reference": null,
"shasum": "c0655c7516d62885d8fc05f7d01fd2056e6cde5a"
},
"type": "library"
},
{
"name": "jquery/plugins/nestedsortable",
"version": "1.3.4",
......
......@@ -292,7 +292,7 @@ class CleanVendors
$fs->remove($vendors . 'adodb/adodb/datadict/datadict-informix.inc.php');
// and cwspear/bootstrap-hover-dropdown includes bootstrap and jquery without asking
$fs->remove($vendors . 'components');
$fs->remove($vendors . 'components/bootstrap');
//Remove extra files to keep the system tidy
$fs->remove($vendors . 'codemirror/codemirror/doc');
......
......@@ -117,9 +117,9 @@ class HeaderLib
public $forceJsRankLate;
public $jquery_version = '2.2.2';
public $jquery_version = '3.1.1';
public $jqueryui_version = '1.11.4';
public $jquerymigrate_version = '1.4.0';
public $jquerymigrate_version = '3.0.0';
function __construct()
......
......@@ -346,17 +346,17 @@ $headerlib->add_jsfile('lib/tiki-js.js');
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-$headerlib->jquerymigrate_version.min.js", true);
$headerlib->add_jsfile_dependancy("vendor/components/jquery-migrate/jquery-migrate.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-$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-$headerlib->jquerymigrate_version.min.js", true);
$headerlib->add_jsfile_dependancy("vendor/jquery/jquery-min/jquery.min.js", true);
$headerlib->add_jsfile_dependancy("vendor/components/jquery-migrate/jquery-migrate.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-$headerlib->jquerymigrate_version.js", true);
$headerlib->add_jsfile_dependancy("vendor/components/jquery/jquery.js", true);
$headerlib->add_jsfile_dependancy("vendor/components/jquery-migrate/jquery-migrate.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