Commit 51f46536 authored by Wouter Wolters's avatar Wouter Wolters Committed by Markus Klein
Browse files

[TASK] Include jQuery with bower and update it to 1.11.3

Resolves: #68023
Releases: master
Change-Id: Ib9456b9edad63b491e2e019d2afa38e3f8eaa310
Reviewed-on: http://review.typo3.org/41064


Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Markus Klein's avatarMarkus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein's avatarMarkus Klein <markus.klein@typo3.org>
parent 0ab8ceaa
......@@ -71,6 +71,11 @@ module.exports = function(grunt) {
'scriptaculous/slider.js': 'scriptaculous-bower/slider.js',
'scriptaculous/sound.js': 'scriptaculous-bower/sound.js',
'scriptaculous/unittest.js': 'scriptaculous-bower/unittest.js',
/**
* copy needed parts of jquery
*/
'jquery/jquery-1.11.3.js': 'jquery/dist/jquery.js',
'jquery/jquery-1.11.3.min.js': 'jquery/dist/jquery.min.js',
/**
* copy needed parts of jquery-ui
*/
......
......@@ -29,6 +29,7 @@
"dependencies": {
"scriptaculous-bower": "1.9.0",
"requirejs": "2.1.15",
"jquery": "1.11.3",
"jquery-ui": "1.11.4",
"eonasdan-bootstrap-datetimepicker": "4.7.14",
"moment": "2.10.3",
......
......@@ -31,7 +31,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
const PART_HEADER = 1;
const PART_FOOTER = 2;
// jQuery Core version that is shipped with TYPO3
const JQUERY_VERSION_LATEST = '1.11.2';
const JQUERY_VERSION_LATEST = '1.11.3';
// jQuery namespace options
const JQUERY_NAMESPACE_NONE = 'none';
const JQUERY_NAMESPACE_DEFAULT = 'jQuery';
......
/*!
* jQuery JavaScript Library v1.11.2
* jQuery JavaScript Library v1.11.3
* http://jquery.com/
*
* Includes Sizzle.js
......@@ -9,7 +9,7 @@
* Released under the MIT license
* http://jquery.org/license
*
* Date: 2014-12-17T15:27Z
* Date: 2015-04-28T16:19Z
*/
(function( global, factory ) {
......@@ -64,7 +64,7 @@ var support = {};
var
version = "1.11.2",
version = "1.11.3",
// Define a local copy of jQuery
jQuery = function( selector, context ) {
......@@ -569,7 +569,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
});
function isArraylike( obj ) {
var length = obj.length,
// Support: iOS 8.2 (not reproducible in simulator)
// `in` check used to prevent JIT error (gh-2145)
// hasOwn isn't used here due to false negatives
// regarding Nodelist length in IE
var length = "length" in obj && obj.length,
type = jQuery.type( obj );
if ( type === "function" || jQuery.isWindow( obj ) ) {
......
......@@ -2,7 +2,7 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers">
<head>
<title>Installing TYPO3 CMS</title>
<script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
<script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-1.11.3.min.js?{time}"></script>
<script type="text/javascript" src="../Resources/Public/Javascript/Install.js?{time}"></script>
<link rel="stylesheet" type="text/css" href="../Resources/Public/Stylesheets/Action/Step/General.css?{time}" />
</head>
......
......@@ -2,5 +2,5 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<link rel="shortcut icon" href="../../../gfx/favicon.ico" />
<link rel="stylesheet" type="text/css" href="../Resources/Public/Stylesheets/Action/Common/Install.css?{time}" />
<script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-1.11.2.min.js?{time}"></script>
<script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-1.11.3.min.js?{time}"></script>
<script type="text/javascript" src="../Resources/Public/Javascript/Install.js?{time}"></script>
Supports Markdown
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