From 0d2edc0bf0e0e82be607f27b68155b69c6ef8260 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Wed, 20 May 2015 15:29:08 +0200 Subject: [PATCH 1/8] opened v2.3 --- composer.json | 7 +------ readme.md | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index f974b7ec4..e2641c675 100644 --- a/composer.json +++ b/composer.json @@ -31,10 +31,5 @@ "autoload": { "classmap": ["src/"] }, - "minimum-stability": "dev", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - } + "minimum-stability": "dev" } diff --git a/readme.md b/readme.md index 1f67b4467..4b81549f6 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,7 @@ Nette Forms: greatly facilitates web forms ========================================== [![Downloads this Month](https://img.shields.io/packagist/dm/nette/forms.svg)](https://packagist.org/packages/nette/forms) -[![Build Status](https://travis-ci.org/nette/forms.svg?branch=master)](https://travis-ci.org/nette/forms) +[![Build Status](https://travis-ci.org/nette/forms.svg?branch=v2.3)](https://travis-ci.org/nette/forms) Nette\Forms greatly facilitates creating and processing web forms. What it can really do? From 1fce0aa2a97a6ee5ab3e90d8cb81aeede923e874 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Thu, 21 May 2015 15:29:51 +0200 Subject: [PATCH 2/8] composer: uses Latte 2.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e2641c675..4ddd17a9c 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "require-dev": { "nette/di": "~2.3", "nette/tester": "~1.3", - "latte/latte": "~2.3, >=2.3.2", + "latte/latte": "~2.3.2", "tracy/tracy": "~2.2" }, "conflict": { From 79e8ffe7e87b87158632c9ea3f788f10053c6085 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Wed, 27 May 2015 14:14:04 +0200 Subject: [PATCH 3/8] netteForms.js: works only with Nette forms [Closes #82] --- src/assets/netteForms.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/assets/netteForms.js b/src/assets/netteForms.js index 81cf84bb4..41f59456b 100644 --- a/src/assets/netteForms.js +++ b/src/assets/netteForms.js @@ -541,7 +541,13 @@ Nette.initForm = function(form) { Nette.initOnLoad = function() { Nette.addEvent(window, 'load', function() { for (var i = 0; i < document.forms.length; i++) { - Nette.initForm(document.forms[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); + break; + } + } } }); }; From a6938310c9bbc040028217912ede804dda02e628 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Wed, 27 May 2015 15:33:26 +0200 Subject: [PATCH 4/8] netteForms.js: fixed toggle in IE < 9 --- src/assets/netteForms.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/netteForms.js b/src/assets/netteForms.js index 41f59456b..d204c645c 100644 --- a/src/assets/netteForms.js +++ b/src/assets/netteForms.js @@ -472,7 +472,7 @@ Nette.toggleControl = function(elem, rules, success, firsttime, value) { for (var i = 0; i < els.length; i++) { if (els[i].name === name && !Nette.inArray(handled, els[i])) { - Nette.addEvent(els[i], oldIE && curElem.type in {checkbox: 1, radio: 1} ? 'click' : 'change', handler); + Nette.addEvent(els[i], oldIE && els[i].type in {checkbox: 1, radio: 1} ? 'click' : 'change', handler); handled.push(els[i]); } } From 5a2fefe435b53f8c6e1b757b3768e875fbb6fe85 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Sun, 14 Jun 2015 16:51:50 +0200 Subject: [PATCH 5/8] travis: removed HHVM nightly --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 111a79205..2c0233fc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,11 @@ php: - 5.6 - 7.0 - hhvm - - hhvm-nightly matrix: allow_failures: - php: 7.0 - php: hhvm - - php: hhvm-nightly script: - vendor/bin/tester tests -s -p php -c tests/php-unix.ini From a1e3965cc3b0df2e99b18b2f7e9cf8d34e4c6402 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Mon, 15 Jun 2015 18:30:59 +0200 Subject: [PATCH 6/8] typos --- src/Forms/Form.php | 2 +- src/Forms/Rules.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Forms/Form.php b/src/Forms/Form.php index b90acb4ac..a04c78e79 100644 --- a/src/Forms/Form.php +++ b/src/Forms/Form.php @@ -159,7 +159,7 @@ protected function attached($obj) /** * Returns self. - * @return Form + * @return self */ public function getForm($need = TRUE) { diff --git a/src/Forms/Rules.php b/src/Forms/Rules.php index 893f19561..bad7871c8 100644 --- a/src/Forms/Rules.php +++ b/src/Forms/Rules.php @@ -96,7 +96,7 @@ public function addRule($validator, $message = NULL, $arg = NULL) * Adds a validation condition and returns new branch. * @param mixed condition type * @param mixed optional condition arguments - * @return Rules new branch + * @return self new branch */ public function addCondition($validator, $arg = NULL) { @@ -109,7 +109,7 @@ public function addCondition($validator, $arg = NULL) * @param IControl form control * @param mixed condition type * @param mixed optional condition arguments - * @return Rules new branch + * @return self new branch */ public function addConditionOn(IControl $control, $validator, $arg = NULL) { @@ -128,7 +128,7 @@ public function addConditionOn(IControl $control, $validator, $arg = NULL) /** * Adds a else statement. - * @return Rules else branch + * @return self else branch */ public function elseCondition() { From ea7b7b8893b1fd218c3220067de4d4e87d7e7e6e Mon Sep 17 00:00:00 2001 From: David Grudl Date: Wed, 17 Jun 2015 15:38:42 +0200 Subject: [PATCH 7/8] CheckboxList, RadioList: fixed rendering of