Skip to content

Commit b417cdf

Browse files
committed
1 parent af31efb commit b417cdf

File tree

10 files changed

+5246
-5291
lines changed

10 files changed

+5246
-5291
lines changed

material/static/material/css/jquery.datetimepicker.css

Lines changed: 568 additions & 568 deletions
Large diffs are not rendered by default.

material/static/material/css/materialize.css

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5678,10 +5678,8 @@ input[type=range]::-moz-range-thumb {
56785678
width: 14px;
56795679
border-radius: 50%;
56805680
background: #37474f;
5681-
-webkit-transition: -webkit-box-shadow .3s;
5682-
transition: -webkit-box-shadow .3s;
5681+
-moz-transition: box-shadow .3s;
56835682
transition: box-shadow .3s;
5684-
transition: box-shadow .3s, -webkit-box-shadow .3s;
56855683
margin-top: -5px; }
56865684

56875685
input[type=range]:-moz-focusring {
@@ -5711,10 +5709,8 @@ input[type=range]::-ms-thumb {
57115709
width: 14px;
57125710
border-radius: 50%;
57135711
background: #37474f;
5714-
-webkit-transition: -webkit-box-shadow .3s;
5715-
transition: -webkit-box-shadow .3s;
5716-
transition: box-shadow .3s;
5717-
transition: box-shadow .3s, -webkit-box-shadow .3s; }
5712+
-ms-transition: box-shadow .3s;
5713+
transition: box-shadow .3s; }
57185714

57195715
.keyboard-focused input[type=range]:focus:not(.active)::-ms-thumb {
57205716
box-shadow: 0 0 0 10px rgba(55, 71, 79, 0.26); }

material/static/material/css/materialize.frontend.min.css

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

material/static/material/css/materialize.frontend.print.min.css

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

material/static/material/js/jquery.datetimepicker.full.js

Lines changed: 2681 additions & 2656 deletions
Large diffs are not rendered by default.

material/static/material/js/jquery.js

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery JavaScript Library v3.4.0
2+
* jQuery JavaScript Library v3.4.1
33
* https://jquery.com/
44
*
55
* Includes Sizzle.js
@@ -9,7 +9,7 @@
99
* Released under the MIT license
1010
* https://jquery.org/license
1111
*
12-
* Date: 2019-04-10T19:48Z
12+
* Date: 2019-05-01T21:04Z
1313
*/
1414
( function( global, factory ) {
1515

@@ -142,7 +142,7 @@ function toType( obj ) {
142142

143143

144144
var
145-
version = "3.4.0",
145+
version = "3.4.1",
146146

147147
// Define a local copy of jQuery
148148
jQuery = function( selector, context ) {
@@ -4498,8 +4498,12 @@ var documentElement = document.documentElement;
44984498
},
44994499
composed = { composed: true };
45004500

4501+
// Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only
45014502
// Check attachment across shadow DOM boundaries when possible (gh-3504)
4502-
if ( documentElement.attachShadow ) {
4503+
// Support: iOS 10.0-10.2 only
4504+
// Early iOS 10 versions support `attachShadow` but not `getRootNode`,
4505+
// leading to errors. We need to check for `getRootNode`.
4506+
if ( documentElement.getRootNode ) {
45034507
isAttached = function( elem ) {
45044508
return jQuery.contains( elem.ownerDocument, elem ) ||
45054509
elem.getRootNode( composed ) === elem.ownerDocument;
@@ -5359,8 +5363,7 @@ jQuery.event = {
53595363

53605364
// Claim the first handler
53615365
if ( rcheckableType.test( el.type ) &&
5362-
el.click && nodeName( el, "input" ) &&
5363-
dataPriv.get( el, "click" ) === undefined ) {
5366+
el.click && nodeName( el, "input" ) ) {
53645367

53655368
// dataPriv.set( el, "click", ... )
53665369
leverageNative( el, "click", returnTrue );
@@ -5377,8 +5380,7 @@ jQuery.event = {
53775380

53785381
// Force setup before triggering a click
53795382
if ( rcheckableType.test( el.type ) &&
5380-
el.click && nodeName( el, "input" ) &&
5381-
dataPriv.get( el, "click" ) === undefined ) {
5383+
el.click && nodeName( el, "input" ) ) {
53825384

53835385
leverageNative( el, "click" );
53845386
}
@@ -5419,7 +5421,9 @@ function leverageNative( el, type, expectSync ) {
54195421

54205422
// Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add
54215423
if ( !expectSync ) {
5422-
jQuery.event.add( el, type, returnTrue );
5424+
if ( dataPriv.get( el, type ) === undefined ) {
5425+
jQuery.event.add( el, type, returnTrue );
5426+
}
54235427
return;
54245428
}
54255429

@@ -5434,9 +5438,13 @@ function leverageNative( el, type, expectSync ) {
54345438
if ( ( event.isTrigger & 1 ) && this[ type ] ) {
54355439

54365440
// Interrupt processing of the outer synthetic .trigger()ed event
5437-
if ( !saved ) {
5441+
// Saved data should be false in such cases, but might be a leftover capture object
5442+
// from an async native handler (gh-4350)
5443+
if ( !saved.length ) {
54385444

54395445
// Store arguments for use when handling the inner native event
5446+
// There will always be at least one argument (an event object), so this array
5447+
// will not be confused with a leftover capture object.
54405448
saved = slice.call( arguments );
54415449
dataPriv.set( this, type, saved );
54425450

@@ -5449,14 +5457,14 @@ function leverageNative( el, type, expectSync ) {
54495457
if ( saved !== result || notAsync ) {
54505458
dataPriv.set( this, type, false );
54515459
} else {
5452-
result = undefined;
5460+
result = {};
54535461
}
54545462
if ( saved !== result ) {
54555463

54565464
// Cancel the outer synthetic event
54575465
event.stopImmediatePropagation();
54585466
event.preventDefault();
5459-
return result;
5467+
return result.value;
54605468
}
54615469

54625470
// If this is an inner synthetic event for an event with a bubbling surrogate
@@ -5471,17 +5479,19 @@ function leverageNative( el, type, expectSync ) {
54715479

54725480
// If this is a native event triggered above, everything is now in order
54735481
// Fire an inner synthetic event with the original arguments
5474-
} else if ( saved ) {
5482+
} else if ( saved.length ) {
54755483

54765484
// ...and capture the result
5477-
dataPriv.set( this, type, jQuery.event.trigger(
5478-
5479-
// Support: IE <=9 - 11+
5480-
// Extend with the prototype to reset the above stopImmediatePropagation()
5481-
jQuery.extend( saved.shift(), jQuery.Event.prototype ),
5482-
saved,
5483-
this
5484-
) );
5485+
dataPriv.set( this, type, {
5486+
value: jQuery.event.trigger(
5487+
5488+
// Support: IE <=9 - 11+
5489+
// Extend with the prototype to reset the above stopImmediatePropagation()
5490+
jQuery.extend( saved[ 0 ], jQuery.Event.prototype ),
5491+
saved.slice( 1 ),
5492+
this
5493+
)
5494+
} );
54855495

54865496
// Abort handling of the native event
54875497
event.stopImmediatePropagation();

material/static/material/js/materialize.frontend.min.js

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

material/static/material/js/materialize.js

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Materialize v1.0.0 (http://materializecss.com)
2+
* Materialize vundefined (http://materializecss.com)
33
* Copyright 2014-2017 Materialize
44
* MIT License (https://raw.githubusercontent.com/Dogfalo/materialize/master/LICENSE)
55
*/
@@ -11717,9 +11717,15 @@ $jscomp.polyfill = function (e, r, p, m) {
1171711717
key: "_handleOptionClick",
1171811718
value: function _handleOptionClick(e) {
1171911719
e.preventDefault();
11720-
var option = $(e.target).closest('li')[0];
11721-
var key = option.id;
11722-
if (!$(option).hasClass('disabled') && !$(option).hasClass('optgroup') && key.length) {
11720+
var optionEl = $(e.target).closest('li')[0];
11721+
this._selectOption(optionEl);
11722+
e.stopPropagation();
11723+
}
11724+
}, {
11725+
key: "_selectOption",
11726+
value: function _selectOption(optionEl) {
11727+
var key = optionEl.id;
11728+
if (!$(optionEl).hasClass('disabled') && !$(optionEl).hasClass('optgroup') && key.length) {
1172311729
var selected = true;
1172411730

1172511731
if (this.isMultiple) {
@@ -11733,7 +11739,7 @@ $jscomp.polyfill = function (e, r, p, m) {
1173311739
selected = this._toggleEntryFromArray(key);
1173411740
} else {
1173511741
$(this.dropdownOptions).find('li').removeClass('selected');
11736-
$(option).toggleClass('selected', selected);
11742+
$(optionEl).toggleClass('selected', selected);
1173711743
}
1173811744

1173911745
// Set selected on original select option
@@ -11745,7 +11751,9 @@ $jscomp.polyfill = function (e, r, p, m) {
1174511751
}
1174611752
}
1174711753

11748-
e.stopPropagation();
11754+
if (!this.isMultiple) {
11755+
this.dropdown.close();
11756+
}
1174911757
}
1175011758

1175111759
/**
@@ -11854,9 +11862,9 @@ $jscomp.polyfill = function (e, r, p, m) {
1185411862
}
1185511863
};
1185611864

11857-
if (this.isMultiple) {
11858-
dropdownOptions.closeOnClick = false;
11859-
}
11865+
// Prevent dropdown from closeing too early
11866+
dropdownOptions.closeOnClick = false;
11867+
1186011868
this.dropdown = M.Dropdown.init(this.input, dropdownOptions);
1186111869
}
1186211870

0 commit comments

Comments
 (0)