@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | if(is_array($element)){ |
68 | 68 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size); |
69 | 69 | $elm->fromArray($element); |
70 | - }else if($element instanceof HtmlLink){ |
|
70 | + } else if($element instanceof HtmlLink){ |
|
71 | 71 | $elm=$element; |
72 | - }else{ |
|
72 | + } else{ |
|
73 | 73 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element); |
74 | 74 | if(isset($glyph)){ |
75 | 75 | $elm->wrapContentWithGlyph($glyph); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | } |
117 | 117 | if($this->absolutePaths===true){ |
118 | 118 | return $this->_hrefFunction($this->content[$index]); |
119 | - }else{ |
|
119 | + } else{ |
|
120 | 120 | return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),0,$index+1)); |
121 | 121 | } |
122 | 122 | } |
@@ -3,7 +3,6 @@ |
||
3 | 3 | |
4 | 4 | use Ajax\bootstrap\html\base\CssSize; |
5 | 5 | use Ajax\JsUtils; |
6 | - |
|
7 | 6 | use Ajax\bootstrap\html\base\HtmlBsDoubleElement; |
8 | 7 | |
9 | 8 | /** |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use Ajax\bootstrap\html\base\CssRef; |
8 | 8 | use Ajax\bootstrap\html\base\HtmlBsDoubleElement; |
9 | 9 | use Ajax\bootstrap\html\content\HtmlCarouselItem; |
10 | - |
|
11 | 10 | use Ajax\common\html\BaseHtml; |
12 | 11 | /** |
13 | 12 | * Composant Twitter Bootstrap Carousel |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Ajax\bootstrap\html\base\HtmlBsDoubleElement; |
6 | 6 | use Ajax\JsUtils; |
7 | - |
|
8 | 7 | use Ajax\common\html\html5\HtmlSelect; |
9 | 8 | |
10 | 9 | class HtmlForm extends HtmlBsDoubleElement { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Ajax\bootstrap\html\base\HtmlBsDoubleElement; |
6 | 6 | use Ajax\JsUtils; |
7 | - |
|
8 | 7 | use Ajax\bootstrap\html\base\CssRef; |
9 | 8 | use Ajax\service\JArray; |
10 | 9 |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Ajax\semantic\html\base\HtmlSemCollection; |
6 | 6 | use Ajax\semantic\html\base\constants\Wide; |
7 | 7 | use Ajax\JsUtils; |
8 | - |
|
9 | 8 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
10 | 9 | use Ajax\semantic\html\collections\form\traits\FieldsTrait; |
11 | 10 |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Ajax\semantic\html\base\HtmlSemNavElement; |
6 | 6 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
7 | - |
|
8 | 7 | use Ajax\semantic\html\elements\HtmlIcon; |
9 | 8 | use Ajax\JsUtils; |
10 | 9 |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Ajax\semantic\html\content\table\HtmlTableContent; |
7 | 7 | use Ajax\semantic\html\base\constants\Variation; |
8 | 8 | use Ajax\JsUtils; |
9 | - |
|
10 | 9 | use Ajax\service\JArray; |
11 | 10 | |
12 | 11 | /** |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
6 | 6 | use Ajax\semantic\html\elements\HtmlIcon; |
7 | 7 | use Ajax\JsUtils; |
8 | - |
|
9 | 8 | use Ajax\service\JArray; |
10 | 9 | use Ajax\semantic\html\elements\html5\HtmlImg; |
11 | 10 |
@@ -60,8 +60,9 @@ discard block |
||
60 | 60 | |
61 | 61 | public function asLink($href=NULL,$part=NULL){ |
62 | 62 | $this->setTagName("a"); |
63 | - if(isset($href)) |
|
64 | - $this->setProperty("href", $href); |
|
63 | + if(isset($href)) { |
|
64 | + $this->setProperty("href", $href); |
|
65 | + } |
|
65 | 66 | return $this; |
66 | 67 | } |
67 | 68 | |
@@ -72,8 +73,9 @@ discard block |
||
72 | 73 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
73 | 74 | */ |
74 | 75 | public function compile(JsUtils $js=NULL, $view=NULL) { |
75 | - if(\is_array($this->content)) |
|
76 | - $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
76 | + if(\is_array($this->content)) { |
|
77 | + $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
78 | + } |
|
77 | 79 | return parent::compile($js, $view); |
78 | 80 | } |
79 | 81 | } |
80 | 82 | \ No newline at end of file |