Skip to content

Commit 489bcdc

Browse files
committed
Upgrade Laravel, jquery and jquery-ujs versions
- Experimental support of Laravel 5.3 - Support jQuery 3.x - Update jquery-ujs to 1.2.2 - Update jQuery to 1.12.4 and 2.2.4
1 parent cabd4f4 commit 489bcdc

File tree

13 files changed

+10198
-143
lines changed

13 files changed

+10198
-143
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ sudo: false
1515
env:
1616
- LARAVEL_VERSION="~5.1.0" TESTBENCH_VERSION="~3.1.0"
1717
- LARAVEL_VERSION="~5.2.0" TESTBENCH_VERSION="~3.2.0"
18+
- LARAVEL_VERSION="~5.3.0" TESTBENCH_VERSION="~3.3.0"
1819

1920
before_install:
20-
- sed -i s/~5.1.0\|\|~5.2.0/${LARAVEL_VERSION}/ composer.json
21-
- sed -i s/~3.1.0\|\|~3.2.0/${TESTBENCH_VERSION}/ composer.json
21+
- sed -i s/~5.1.0\|\|~5.2.0\|\|~5.3.0/${LARAVEL_VERSION}/ composer.json
22+
- sed -i s/~3.1.0\|\|~3.2.0\|\|~3.3.0/${TESTBENCH_VERSION}/ composer.json
2223
- composer update # Use update since we'll be changing the composer.json
2324

2425
script: vendor/bin/phpunit tests

README.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# jquery-laravel [![Build Status](https://travis-ci.org/efficiently/jquery-laravel.png?branch=2.1)](http://travis-ci.org/efficiently/jquery-laravel)
1+
# jquery-laravel [![Build Status](https://travis-ci.org/efficiently/jquery-laravel.png?branch=2.2)](http://travis-ci.org/efficiently/jquery-laravel)
22

3-
jQuery! For Laravel 5.1 & 5.2! So great.
3+
jQuery! For Laravel 5.1, 5.2 and 5.3! So great.
44

55
This package provides:
66

7-
* jQuery 1 and jQuery 2
7+
* jQuery 1, 2 and 3
88
* the jQuery UJS adapter
99

1010
## Versions
@@ -18,6 +18,8 @@ minor version bump = minor-level updates to jQuery
1818
major version bump = major-level updates to jQuery and updates to Laravel/Larasset which may be backwards-incompatible
1919
```
2020

21+
For [**Laravel 5.1 or 5.2**](http://laravel.com/docs/5.2) supports see [jQuery-Laravel 2.1 branch](https://github.com/efficiently/jquery-laravel/tree/2.1)
22+
2123
For [**Laravel 5.0**](http://laravel.com/docs/5.0) supports see [jQuery-Laravel 2.0 branch](https://github.com/efficiently/jquery-laravel/tree/2.0)
2224

2325
For [**Laravel 4.1 or 4.2**](http://laravel.com/docs/4.2) supports see [jQuery-Laravel 1.0 branch](https://github.com/efficiently/jquery-laravel/tree/1.0)
@@ -63,6 +65,13 @@ If you want to use jQuery 2, you can require `jquery2` instead:
6365
//= require jquery_ujs
6466
```
6567
68+
And if you want to use jQuery 3, you can require `jquery3`:
69+
70+
```js
71+
//= require jquery3
72+
//= require jquery_ujs
73+
```
74+
6675
## Contributing
6776
6877
Feel free to open an issue ticket if you find something that could be improved. A couple notes:

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"laravel",
77
"laravel 5.1",
88
"laravel 5.2",
9+
"laravel 5.3",
910
"larasset",
1011
"assets",
1112
"asset pipeline",
@@ -24,13 +25,13 @@
2425
],
2526
"require": {
2627
"php": ">=5.5.0",
27-
"illuminate/support": "~5.1.0||~5.2.0",
28-
"laravelcollective/html": "~5.1.0||~5.2.0"
28+
"illuminate/support": "~5.1.0||~5.2.0||~5.3.0",
29+
"laravelcollective/html": "~5.1.0||~5.2.0||~5.3.0"
2930
},
3031
"require-dev": {
3132
"phpunit/phpunit": "~4.5",
3233
"mockery/mockery": "0.9.*",
33-
"orchestra/testbench": "~3.1.0||~3.2.0",
34+
"orchestra/testbench": "~3.1.0||~3.2.0||~3.3.0",
3435
"anahkiasen/former": "~4.0.0"
3536
},
3637
"autoload": {

provider/assets/js/jquery.js

Lines changed: 32 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery JavaScript Library v1.12.1
2+
* jQuery JavaScript Library v1.12.4
33
* http://jquery.com/
44
*
55
* Includes Sizzle.js
@@ -9,7 +9,7 @@
99
* Released under the MIT license
1010
* http://jquery.org/license
1111
*
12-
* Date: 2016-02-22T19:07Z
12+
* Date: 2016-05-20T17:17Z
1313
*/
1414

1515
(function( global, factory ) {
@@ -65,7 +65,7 @@ var support = {};
6565

6666

6767
var
68-
version = "1.12.1",
68+
version = "1.12.4",
6969

7070
// Define a local copy of jQuery
7171
jQuery = function( selector, context ) {
@@ -6672,6 +6672,7 @@ var documentElement = document.documentElement;
66726672
if ( reliableHiddenOffsetsVal ) {
66736673
div.style.display = "";
66746674
div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
6675+
div.childNodes[ 0 ].style.borderCollapse = "separate";
66756676
contents = div.getElementsByTagName( "td" );
66766677
contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
66776678
reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
@@ -6996,19 +6997,6 @@ function getWidthOrHeight( elem, name, extra ) {
69966997
isBorderBox = support.boxSizing &&
69976998
jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
69986999

6999-
// Support: IE11 only
7000-
// In IE 11 fullscreen elements inside of an iframe have
7001-
// 100x too small dimensions (gh-1764).
7002-
if ( document.msFullscreenElement && window.top !== window ) {
7003-
7004-
// Support: IE11 only
7005-
// Running getBoundingClientRect on a disconnected node
7006-
// in IE throws an error.
7007-
if ( elem.getClientRects().length ) {
7008-
val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
7009-
}
7010-
}
7011-
70127000
// some non-html elements return undefined for offsetWidth, so check for null/undefined
70137001
// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
70147002
// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
@@ -8198,7 +8186,8 @@ jQuery.fn.delay = function( time, type ) {
81988186
} )();
81998187

82008188

8201-
var rreturn = /\r/g;
8189+
var rreturn = /\r/g,
8190+
rspaces = /[\x20\t\r\n\f]+/g;
82028191

82038192
jQuery.fn.extend( {
82048193
val: function( value ) {
@@ -8278,7 +8267,9 @@ jQuery.extend( {
82788267

82798268
// Support: IE10-11+
82808269
// option.text throws exceptions (#14686, #14858)
8281-
jQuery.trim( jQuery.text( elem ) );
8270+
// Strip and collapse whitespace
8271+
// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
8272+
jQuery.trim( jQuery.text( elem ) ).replace( rspaces, " " );
82828273
}
82838274
},
82848275
select: {
@@ -8332,7 +8323,7 @@ jQuery.extend( {
83328323
while ( i-- ) {
83338324
option = options[ i ];
83348325

8335-
if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0 ) {
8326+
if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 ) {
83368327

83378328
// Support: IE6
83388329
// When new option element is added to select box we need to
@@ -8751,8 +8742,11 @@ if ( !support.hrefNormalized ) {
87518742
}
87528743

87538744
// Support: Safari, IE9+
8754-
// mis-reports the default selected property of an option
8755-
// Accessing the parent's selectedIndex property fixes it
8745+
// Accessing the selectedIndex property
8746+
// forces the browser to respect setting selected
8747+
// on the option
8748+
// The getter ensures a default option is selected
8749+
// when in an optgroup
87568750
if ( !support.optSelected ) {
87578751
jQuery.propHooks.selected = {
87588752
get: function( elem ) {
@@ -8767,6 +8761,16 @@ if ( !support.optSelected ) {
87678761
}
87688762
}
87698763
return null;
8764+
},
8765+
set: function( elem ) {
8766+
var parent = elem.parentNode;
8767+
if ( parent ) {
8768+
parent.selectedIndex;
8769+
8770+
if ( parent.parentNode ) {
8771+
parent.parentNode.selectedIndex;
8772+
}
8773+
}
87708774
}
87718775
};
87728776
}
@@ -9983,6 +9987,11 @@ function getDisplay( elem ) {
99839987
}
99849988

99859989
function filterHidden( elem ) {
9990+
9991+
// Disconnected elements are considered hidden
9992+
if ( !jQuery.contains( elem.ownerDocument || document, elem ) ) {
9993+
return true;
9994+
}
99869995
while ( elem && elem.nodeType === 1 ) {
99879996
if ( getDisplay( elem ) === "none" || elem.type === "hidden" ) {
99889997
return true;
@@ -10349,13 +10358,6 @@ function createActiveXHR() {
1034910358

1035010359

1035110360

10352-
// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
10353-
jQuery.ajaxPrefilter( function( s ) {
10354-
if ( s.crossDomain ) {
10355-
s.contents.script = false;
10356-
}
10357-
} );
10358-
1035910361
// Install script dataType
1036010362
jQuery.ajaxSetup( {
1036110363
accepts: {
@@ -10542,21 +10544,6 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
1054210544

1054310545

1054410546

10545-
// Support: Safari 8+
10546-
// In Safari 8 documents created via document.implementation.createHTMLDocument
10547-
// collapse sibling forms: the second one becomes a child of the first one.
10548-
// Because of that, this security measure has to be disabled in Safari 8.
10549-
// https://bugs.webkit.org/show_bug.cgi?id=137337
10550-
support.createHTMLDocument = ( function() {
10551-
if ( !document.implementation.createHTMLDocument ) {
10552-
return false;
10553-
}
10554-
var doc = document.implementation.createHTMLDocument( "" );
10555-
doc.body.innerHTML = "<form></form><form></form>";
10556-
return doc.body.childNodes.length === 2;
10557-
} )();
10558-
10559-
1056010547
// data: string of html
1056110548
// context (optional): If specified, the fragment will be created in this context,
1056210549
// defaults to document
@@ -10569,12 +10556,7 @@ jQuery.parseHTML = function( data, context, keepScripts ) {
1056910556
keepScripts = context;
1057010557
context = false;
1057110558
}
10572-
10573-
// document.implementation stops scripts or inline event handlers from
10574-
// being executed immediately
10575-
context = context || ( support.createHTMLDocument ?
10576-
document.implementation.createHTMLDocument( "" ) :
10577-
document );
10559+
context = context || document;
1057810560

1057910561
var parsed = rsingleTag.exec( data ),
1058010562
scripts = !keepScripts && [];
@@ -10656,7 +10638,7 @@ jQuery.fn.load = function( url, params, callback ) {
1065610638
// If it fails, this function gets "jqXHR", "status", "error"
1065710639
} ).always( callback && function( jqXHR, status ) {
1065810640
self.each( function() {
10659-
callback.apply( self, response || [ jqXHR.responseText, status, jqXHR ] );
10641+
callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
1066010642
} );
1066110643
} );
1066210644
}

provider/assets/js/jquery.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provider/assets/js/jquery.min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)