Skip to content

Commit 883d371

Browse files
committed
netteForms: removed Nette.addEvent()
1 parent 7c8f352 commit 883d371

File tree

1 file changed

+9
-23
lines changed

1 file changed

+9
-23
lines changed

src/assets/netteForms.js

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,18 @@
3535

3636

3737
/**
38-
* Attaches a handler to an event for the element.
38+
* Function to execute when the DOM is fully loaded.
39+
* @private
3940
*/
40-
Nette.addEvent = function(element, on, callback) {
41-
if (on === 'DOMContentLoaded' && element.readyState !== 'loading') {
41+
Nette.onDocumentReady = function(callback) {
42+
if (document.readyState !== 'loading') {
4243
callback.call(this);
43-
} else if (element.addEventListener) {
44-
element.addEventListener(on, callback);
45-
} else if (on === 'DOMContentLoaded') {
46-
element.attachEvent('onreadystatechange', function() {
47-
if (element.readyState === 'complete') {
48-
callback.call(this);
49-
}
50-
});
5144
} else {
52-
element.attachEvent('on' + on, getHandler(callback));
45+
document.addEventListener('DOMContentLoaded', callback);
5346
}
5447
};
5548

5649

57-
function getHandler(callback) {
58-
return function(e) {
59-
return callback.call(this, e);
60-
};
61-
}
62-
63-
6450
/**
6551
* Returns the value of form element.
6652
*/
@@ -634,7 +620,7 @@
634620

635621
for (var i = 0; i < els.length; i++) {
636622
if (els[i].name === name && handled.indexOf(els[i]) < 0) {
637-
Nette.addEvent(els[i], 'change', handler);
623+
els[i].addEventListener('change', handler);
638624
handled.push(els[i]);
639625
}
640626
}
@@ -676,7 +662,7 @@
676662

677663
form.noValidate = true;
678664

679-
Nette.addEvent(form, 'submit', function(e) {
665+
form.addEventListener('submit', function(e) {
680666
if (!Nette.validateForm(form)) {
681667
e.stopPropagation();
682668
e.preventDefault();
@@ -689,7 +675,7 @@
689675
* @private
690676
*/
691677
Nette.initOnLoad = function() {
692-
Nette.addEvent(document, 'DOMContentLoaded', function() {
678+
Nette.onDocumentReady(function() {
693679
for (var i = 0; i < document.forms.length; i++) {
694680
var form = document.forms[i];
695681
for (var j = 0; j < form.elements.length; j++) {
@@ -700,7 +686,7 @@
700686
}
701687
}
702688

703-
Nette.addEvent(document.body, 'click', function(e) {
689+
document.body.addEventListener('click', function(e) {
704690
var target = e.target;
705691
while (target) {
706692
if (target.form && target.type in {submit: 1, image: 1}) {

0 commit comments

Comments
 (0)