Skip to content

Commit

Permalink
Merge branch 'SWIK_2397_Zoom_Issues_Touch' into r2.9.x
Browse files Browse the repository at this point in the history
  • Loading branch information
ali1k committed Aug 2, 2018
2 parents 3642055 + b531668 commit d91012b
Show file tree
Hide file tree
Showing 145 changed files with 416 additions and 347 deletions.
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/accordion.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Accordion
* # Semantic UI 2.3.3 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/accordion.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Accordion
* # Semantic UI 2.3.3 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/ad.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Ad
* # Semantic UI 2.3.3 - Ad
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/ad.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/api.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - API
* # Semantic UI 2.3.3 - API
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/breadcrumb.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Breadcrumb
* # Semantic UI 2.3.3 - Breadcrumb
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/button.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Button
* # Semantic UI 2.3.3 - Button
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/button.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/card.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Item
* # Semantic UI 2.3.3 - Item
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/card.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/checkbox.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Checkbox
* # Semantic UI 2.3.3 - Checkbox
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/checkbox.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Checkbox
* # Semantic UI 2.3.3 - Checkbox
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/checkbox.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/comment.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Comment
* # Semantic UI 2.3.3 - Comment
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/comment.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/container.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Container
* # Semantic UI 2.3.3 - Container
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/dimmer.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Dimmer
* # Semantic UI 2.3.3 - Dimmer
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
18 changes: 10 additions & 8 deletions assets/custom-semantic-ui/dist/components/dimmer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Dimmer
* # Semantic UI 2.3.3 - Dimmer
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down Expand Up @@ -114,10 +114,6 @@ $.fn.dimmer = function(parameters) {

bind: {
events: function() {
if(module.is.page()) {
// touch events default to passive, due to changes in chrome to optimize mobile perf
$dimmable.get(0).addEventListener('touchmove', module.event.preventScroll, { passive: false });
}
if(settings.on == 'hover') {
$dimmable
.on('mouseenter' + eventNamespace, module.show)
Expand Down Expand Up @@ -145,9 +141,6 @@ $.fn.dimmer = function(parameters) {

unbind: {
events: function() {
if(module.is.page()) {
$dimmable.get(0).removeEventListener('touchmove', module.event.preventScroll, { passive: false });
}
$module
.removeData(moduleNamespace)
;
Expand Down Expand Up @@ -204,6 +197,11 @@ $.fn.dimmer = function(parameters) {
module.animate.show(callback);
settings.onShow.call(element);
settings.onChange.call(element);

if(module.is.page()) {
// touch events default to passive, due to changes in chrome to optimize mobile perf
$dimmable.get(0).addEventListener('touchmove', module.event.preventScroll, { passive: false });
}
}
else {
module.debug('Dimmer is already shown or disabled');
Expand All @@ -220,6 +218,10 @@ $.fn.dimmer = function(parameters) {
module.animate.hide(callback);
settings.onHide.call(element);
settings.onChange.call(element);

if(module.is.page()) {
$dimmable.get(0).removeEventListener('touchmove', module.event.preventScroll, { passive: false });
}
}
else {
module.debug('Dimmer is not visible');
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/dimmer.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/dimmer.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/divider.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Divider
* # Semantic UI 2.3.3 - Divider
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/divider.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/dropdown.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Dropdown
* # Semantic UI 2.3.3 - Dropdown
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Dropdown
* # Semantic UI 2.3.3 - Dropdown
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/dropdown.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/embed.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Video
* # Semantic UI 2.3.3 - Video
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/embed.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Embed
* # Semantic UI 2.3.3 - Embed
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/embed.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/feed.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Feed
* # Semantic UI 2.3.3 - Feed
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/feed.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/flag.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Flag
* # Semantic UI 2.3.3 - Flag
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/flag.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/form.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Form
* # Semantic UI 2.3.3 - Form
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/form.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Form Validation
* # Semantic UI 2.3.3 - Form Validation
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/form.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/grid.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Grid
* # Semantic UI 2.3.3 - Grid
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/grid.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/header.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Header
* # Semantic UI 2.3.3 - Header
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/header.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/icon.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Icon
* # Semantic UI 2.3.3 - Icon
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/icon.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/image.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Image
* # Semantic UI 2.3.3 - Image
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/image.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/input.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Input
* # Semantic UI 2.3.3 - Input
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/input.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/item.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Item
* # Semantic UI 2.3.3 - Item
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/item.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/custom-semantic-ui/dist/components/label.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.3.2 - Label
* # Semantic UI 2.3.3 - Label
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down
Loading

0 comments on commit d91012b

Please sign in to comment.