Skip to content

Commit bda9b8b

Browse files
committed
no html5 validation
1 parent 6adf1e7 commit bda9b8b

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

Ajax/semantic/html/collections/form/HtmlForm.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,12 @@ private function addCompoValidation($js,$compo,$field){
155155
return $compo;
156156
}
157157

158+
public function compile(JsUtils $js=NULL,&$view=NULL){
159+
if(\sizeof($this->_validationParams)>0)
160+
$this->setProperty("novalidate", "");
161+
return parent::compile($js,$view);
162+
}
163+
158164
public function run(JsUtils $js) {
159165
$compo=NULL;
160166
foreach ($this->_fields as $field){

Ajax/semantic/widgets/base/FieldAsTrait.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Ajax\semantic\html\elements\HtmlLabel;
1111
use Ajax\semantic\html\modules\HtmlProgress;
1212
use Ajax\semantic\html\modules\HtmlRating;
13-
use Ajax\semantic\html\collections\HtmlMessage;
1413
/**
1514
* @author jc
1615
* @property InstanceViewer $_instanceViewer
@@ -26,7 +25,7 @@ private function _getLabelField($caption,$icon=NULL){
2625
return $label;
2726
}
2827

29-
protected function _addRules($element,$attributes){}
28+
protected function _addRules($element,&$attributes){}
3029

3130
protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
3231
$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){

Ajax/semantic/widgets/dataform/FormFieldAsTrait.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@ protected function _applyAttributes($element,&$attributes,$index){
4242
$element->fromArray($attributes);
4343
}
4444

45-
protected function _addRules($element,$attributes){
45+
protected function _addRules($element,&$attributes){
4646
if(isset($attributes["rules"])){
4747
$rules=$attributes["rules"];
48-
if(\is_array($rules))
48+
if(\is_array($rules)){
4949
$element->addRules($rules);
50-
else
51-
$element->addRule($rules);
52-
unset($attributes["rules"]);
50+
}
51+
else
52+
$element->addRule($rules);
53+
unset($attributes["rules"]);
5354
}
5455
}
5556

@@ -58,8 +59,9 @@ protected function _fieldAs($elementCallback,$index,$attributes=NULL,$identifier
5859
$caption=$this->_instanceViewer->getCaption($index);
5960
$name=$this->_instanceViewer->getFieldName($index);
6061
$element=$elementCallback($this->getIdentifier()."-".$name,$name,$value,$caption);
61-
if(\is_array($attributes))
62+
if(\is_array($attributes)){
6263
$this->_applyAttributes($element, $attributes,$index);
64+
}
6365
return $element;
6466
});
6567
return $this;
@@ -110,7 +112,7 @@ public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=
110112

111113
public function fieldAsMessage($index,$attributes=NULL){
112114
return $this->_fieldAs(function($id,$name,$value,$caption){
113-
$mess= new HtmlMessage($id,$value);
115+
$mess= new HtmlMessage("message-".$id,$value);
114116
$mess->addHeader($caption);
115117
return $mess;
116118
}, $index,$attributes,"message");

0 commit comments

Comments
 (0)