Skip to content

Commit

Permalink
Merge branch 'master' into master-xmr-examples
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Jun 5, 2019
2 parents 3827b58 + 1c510dd commit 82fb9f9
Show file tree
Hide file tree
Showing 16 changed files with 614 additions and 660 deletions.
1 change: 1 addition & 0 deletions .eslintrc.json
Expand Up @@ -45,6 +45,7 @@
],
"unicorn/explicit-length-check": "off",
"unicorn/import-index": "off",
"unicorn/no-for-loop": "off",
"unicorn/no-unused-properties": "error",
"unicorn/prefer-includes": "off",
"unicorn/prefer-node-append": "off",
Expand Down
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Expand Up @@ -205,15 +205,15 @@ includes code changes) and under the terms of the

### HTML

[Adhere to the Code Guide.](http://codeguide.co/#html)
[Adhere to the Code Guide.](https://codeguide.co/#html)

- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags).
- Use CDNs and HTTPS for third-party JS when possible. We don't use protocol-relative URLs in this case because they break when viewing the page locally via `file://`.
- Use [WAI-ARIA](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA) attributes in documentation examples to promote accessibility.

### CSS

[Adhere to the Code Guide.](http://codeguide.co/#css)
[Adhere to the Code Guide.](https://codeguide.co/#css)

- When feasible, default color palettes should comply with [WCAG color contrast guidelines](https://www.w3.org/TR/WCAG20/#visual-audio-contrast).
- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](https://a11yproject.com/posts/never-remove-css-outlines/) for more details.
Expand Down
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
@@ -0,0 +1,3 @@
# These are supported funding model platforms

open_collective: bootstrap
10 changes: 6 additions & 4 deletions js/src/dom/event-handler.js
Expand Up @@ -136,11 +136,13 @@ function bootstrapDelegationHandler(element, selector, fn) {
}

function findHandler(events, handler, delegationSelector = null) {
for (const uid of Object.keys(events)) {
const event = events[uid]
const uidEventList = Object.keys(events)

for (let i = 0, len = uidEventList.length; i < len; i++) {
const event = events[uidEventList[i]]

if (event.originalHandler === handler && event.delegationSelector === delegationSelector) {
return events[uid]
return event
}
}

Expand Down Expand Up @@ -204,7 +206,7 @@ function addHandler(element, originalTypeEvent, handler, delegationFn, oneOff) {
function removeHandler(element, events, typeEvent, handler, delegationSelector) {
const fn = findHandler(events[typeEvent], handler, delegationSelector)

if (fn === null) {
if (!fn) {
return
}

Expand Down

0 comments on commit 82fb9f9

Please sign in to comment.