Skip to content

Commit 95e62e8

Browse files
committed
Fix dropdown/instanceViewer pb (null or empty value)
1 parent 134d55b commit 95e62e8

File tree

4 files changed

+641
-528
lines changed

4 files changed

+641
-528
lines changed

Ajax/semantic/html/modules/HtmlDropdown.php

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?php
22
namespace Ajax\semantic\html\modules;
33

4-
use Ajax\semantic\html\base\HtmlSemDoubleElement;
5-
use Ajax\semantic\html\content\HtmlDropdownItem;
6-
use Ajax\semantic\html\elements\HtmlIcon;
4+
use Ajax\JsUtils;
5+
use Ajax\common\html\HtmlDoubleElement;
76
use Ajax\common\html\html5\HtmlInput;
8-
use Ajax\service\JArray;
7+
use Ajax\semantic\html\base\HtmlSemDoubleElement;
98
use Ajax\semantic\html\base\constants\Direction;
109
use Ajax\semantic\html\base\traits\LabeledIconTrait;
11-
use Ajax\JsUtils;
1210
use Ajax\semantic\html\collections\form\traits\FieldTrait;
13-
use Ajax\common\html\HtmlDoubleElement;
11+
use Ajax\semantic\html\content\HtmlDropdownItem;
12+
use Ajax\semantic\html\elements\HtmlIcon;
13+
use Ajax\service\JArray;
1414

1515
class HtmlDropdown extends HtmlSemDoubleElement {
1616
use FieldTrait,LabeledIconTrait {
@@ -43,18 +43,16 @@ public function __construct($identifier, $value = "", $items = array(), $associa
4343
$this->setProperty("class", "ui dropdown");
4444
$this->_multiple = false;
4545
$content = [];
46-
if (isset($value)) {
47-
if ($value instanceof HtmlSemDoubleElement) {
48-
$text = $value;
49-
} else {
50-
$text = new HtmlSemDoubleElement("text-" . $this->identifier, "div");
51-
$text->setClass("text");
52-
$this->setValue($value);
53-
}
54-
$content = [
55-
"text" => $text
56-
];
46+
if ($value instanceof HtmlSemDoubleElement) {
47+
$text = $value;
48+
} else {
49+
$text = new HtmlSemDoubleElement("text-" . $this->identifier, "div");
50+
$text->setClass("text");
51+
$this->setValue($value);
5752
}
53+
$content = [
54+
"text" => $text
55+
];
5856
$content["arrow"] = new HtmlIcon($identifier . "-icon", "dropdown");
5957
$this->content = $content;
6058
$this->tagName = "div";

0 commit comments

Comments
 (0)