Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for modules #49

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for modules #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96c47e4
Add support for modules
Nov 27, 2018
1022c67
Exclude init method from initOnLoad to be called manually at module
Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 78 additions & 11 deletions live-form-validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,39 @@
* @url https://github.com/Robyer/nette-live-form-validation/
*/

var LiveForm = {
options: {
(function (global, factoryLiveValidation, factoryNetteForm) {

if (typeof define === 'function' && define.amd) {
// AMD
define(function () {
return {
LiveForm: factoryLiveValidation(global),
Nette: factoryNetteForm(global)
}
})
} else if (typeof exports === 'object') {
// Node, CommonJS-like
module.exports = {
LiveForm: factoryLiveValidation(global),
Nette: factoryNetteForm(global)
}
} else {
global.LiveForm = factoryLiveValidation(global);
// Browser globals (root is window)
var init = !global.Nette || !global.Nette.noInit;
global.Nette = factoryNetteForm(global);
if (init) {
global.Nette.initOnLoad();
}
}


}(typeof window !== 'undefined' ? window : this, function (window) {
'use strict'


var LiveForm = {
options: {
// CSS class of control's parent where error/valid class should be added; or "false" to use control directly
showMessageClassOnParent: 'form-group',

Expand Down Expand Up @@ -383,6 +414,8 @@ LiveForm.setFormProperty = function(form, propertyName, value) {
this.forms[form.id][propertyName] = value;
};

return LiveForm;

//////////////////////////// modified netteForms.js ///////////////////////////////////

/**
Expand All @@ -392,6 +425,8 @@ LiveForm.setFormProperty = function(form, propertyName, value) {
* Copyright (c) 2004 David Grudl (https://davidgrudl.com)
*/

// LiveForm: original netteForms.js code
/*
(function(global, factory) {
if (!global.JSON) {
return;
Expand All @@ -412,7 +447,10 @@ LiveForm.setFormProperty = function(form, propertyName, value) {
}

}(typeof window !== 'undefined' ? window : this, function(window) {
*/

// LiveForm: addition
}, function (window) {
'use strict';

var Nette = {};
Expand Down Expand Up @@ -1158,20 +1196,13 @@ Nette.initForm = function(form) {
*/
Nette.initOnLoad = function() {
Nette.addEvent(document, 'DOMContentLoaded', function() {
// LiveForm: original netteForms.js code
/*
for (var i = 0; i < document.forms.length; i++) {
var form = document.forms[i];
for (var j = 0; j < form.elements.length; j++) {
if (form.elements[j].getAttribute('data-nette-rules')) {
Nette.initForm(form);

// LiveForm: addition
if (LiveForm.hasClass(form, 'validate-on-load')) {
// This is not so nice way, but I don't want to spoil validateForm, validateControl and other methods with another parameter
LiveForm.setFormProperty(form, "onLoadValidation", true);
Nette.validateForm(form);
LiveForm.setFormProperty(form, "onLoadValidation", false);
}

break;
}
}
Expand All @@ -1183,6 +1214,42 @@ Nette.initOnLoad = function() {
target.form['nette-submittedBy'] = target;
}
});
*/
// LiveForm: addition
Nette.init();
});
};

// LiveForm: addition
/**
* Init function to be called in case usage as module
*
* @public
*/
Nette.init = function() {
for (var i = 0; i < document.forms.length; i++) {
var form = document.forms[i];
for (var j = 0; j < form.elements.length; j++) {
if (form.elements[j].getAttribute('data-nette-rules')) {
Nette.initForm(form);

if (LiveForm.hasClass(form, 'validate-on-load')) {
// This is not so nice way, but I don't want to spoil validateForm, validateControl and other methods with another parameter
LiveForm.setFormProperty(form, "onLoadValidation", true);
Nette.validateForm(form);
LiveForm.setFormProperty(form, "onLoadValidation", false);
}

break;
}
}
}

Nette.addEvent(document.body, 'click', function(e) {
var target = e.target || e.srcElement;
if (target.form && target.type in {submit: 1, image: 1}) {
target.form['nette-submittedBy'] = target;
}
});
};

Expand Down