Merge pull request #204 from HugoGiraudel/patch-2

[RFR] Prevented an extra loop when jQuery is present
drublic · Apr 18, 2016 · a21b645 · a21b645
2 parents bc13776 + 7357007
commit a21b645
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/modal.js b/modal.js
@@ -49,18 +49,15 @@
  if (!elements.length) {
  elements = [elements];
  }
-
- for (; i < elements.length; i++) {
-
- // If jQuery is supported
- if ($) {
- $(elements[i]).on(event, callback);
-
- // Default way to support events
- } else if ('addEventListener' in elements[i]) {
- elements[i].addEventListener(event, callback, false);
+
+ // If jQuery is supported
+ if ($) {
+ $(elements).on(event, callback);
+ // Default way to support events
+ } else {
+ for (; i < elements.length; i++) {
+ elements[i].addEventListener && elements[i].addEventListener(event, callback, false);
  }
-
  }
  },