Skip to content

Commit 3dba18a

Browse files
fixed empty text in jquery extension
1 parent 90275be commit 3dba18a

File tree

7 files changed

+28
-25
lines changed

7 files changed

+28
-25
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# CHANGELOG for husky
22

33
* dev-develop
4+
* BUGFIX #617 Fixed jquery text function with empty value
45
* FEATURE #597 added additional callback for select and fixed css bugs
56
* BUGFIX #616 Fixed label tick in firefox
67
* ENHANCEMENT #615 Introduced no-img-icon as function to use record dependent icons

dist/husky.css

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10078,12 +10078,13 @@ a.btn-black, a.btn-highlight {
1007810078
}
1007910079
/* line 50, ../scss/modules/select.scss */
1008010080
.husky-select-container .husky-select-label {
10081+
min-height: 30px;
1008110082
overflow: hidden;
1008210083
text-overflow: ellipsis;
1008310084
white-space: nowrap;
1008410085
display: block;
1008510086
}
10086-
/* line 57, ../scss/modules/select.scss */
10087+
/* line 58, ../scss/modules/select.scss */
1008710088
.husky-select-container .dropdown-list {
1008810089
min-width: 100%;
1008910090
position: absolute;
@@ -10095,107 +10096,107 @@ a.btn-black, a.btn-highlight {
1009510096
z-index: 2000;
1009610097
border-radius: 3px;
1009710098
}
10098-
/* line 68, ../scss/modules/select.scss */
10099+
/* line 69, ../scss/modules/select.scss */
1009910100
.husky-select-container .dropdown-list .divider {
1010010101
max-width: 100%;
1010110102
height: 1px;
1010210103
background-color: #ccc;
1010310104
margin: 5px 0 10px;
1010410105
}
10105-
/* line 75, ../scss/modules/select.scss */
10106+
/* line 76, ../scss/modules/select.scss */
1010610107
.husky-select-container .dropdown-list.top {
1010710108
top: inherit;
1010810109
bottom: 5px;
1010910110
}
10110-
/* line 80, ../scss/modules/select.scss */
10111+
/* line 81, ../scss/modules/select.scss */
1011110112
.husky-select-container .dropdown-list .disabled,
1011210113
.husky-select-container .dropdown-list .disabled:hover {
1011310114
background: none;
1011410115
cursor: default;
1011510116
}
10116-
/* line 84, ../scss/modules/select.scss */
10117+
/* line 85, ../scss/modules/select.scss */
1011710118
.husky-select-container .dropdown-list .disabled .item-value,
1011810119
.husky-select-container .dropdown-list .disabled:hover .item-value {
1011910120
color: #999;
1012010121
}
10121-
/* line 88, ../scss/modules/select.scss */
10122+
/* line 89, ../scss/modules/select.scss */
1012210123
.husky-select-container .dropdown-list .check {
1012310124
display: inline;
1012410125
width: 20px;
1012510126
margin-right: 10px;
1012610127
padding-top: 7px;
1012710128
}
10128-
/* line 94, ../scss/modules/select.scss */
10129+
/* line 95, ../scss/modules/select.scss */
1012910130
.husky-select-container .dropdown-list .item-value {
1013010131
display: inline;
1013110132
line-height: 30px;
1013210133
}
10133-
/* line 99, ../scss/modules/select.scss */
10134+
/* line 100, ../scss/modules/select.scss */
1013410135
.husky-select-container .dropdown-list > ul {
1013510136
list-style: none;
1013610137
margin: 0;
1013710138
padding: 10px 0;
1013810139
}
10139-
/* line 104, ../scss/modules/select.scss */
10140+
/* line 105, ../scss/modules/select.scss */
1014010141
.husky-select-container .dropdown-list > ul input {
1014110142
margin: 0;
1014210143
}
10143-
/* line 108, ../scss/modules/select.scss */
10144+
/* line 109, ../scss/modules/select.scss */
1014410145
.husky-select-container .dropdown-list > ul > li {
1014510146
padding: 0px 20px 0px 20px;
1014610147
clear: both;
1014710148
height: 30px;
1014810149
}
10149-
/* line 113, ../scss/modules/select.scss */
10150+
/* line 114, ../scss/modules/select.scss */
1015010151
.husky-select-container .dropdown-list > ul > li > div {
1015110152
text-overflow: ellipsis;
1015210153
overflow: hidden;
1015310154
white-space: nowrap;
1015410155
}
10155-
/* line 119, ../scss/modules/select.scss */
10156+
/* line 120, ../scss/modules/select.scss */
1015610157
.husky-select-container .dropdown-list > ul > li:hover, .husky-select-container .dropdown-list > ul > li.hover {
1015710158
background-color: #52B6CA;
1015810159
cursor: pointer;
1015910160
}
10160-
/* line 124, ../scss/modules/select.scss */
10161+
/* line 125, ../scss/modules/select.scss */
1016110162
.husky-select-container .dropdown-list > ul > li:hover .item-value {
1016210163
color: #fff;
1016310164
}
10164-
/* line 128, ../scss/modules/select.scss */
10165+
/* line 129, ../scss/modules/select.scss */
1016510166
.husky-select-container .dropdown-list > ul > li:hover > div {
1016610167
color: #fff;
1016710168
}
10168-
/* line 136, ../scss/modules/select.scss */
10169+
/* line 137, ../scss/modules/select.scss */
1016910170
.husky-select-container.small .dropdown-label {
1017010171
font-size: 10px;
1017110172
line-height: 20px;
1017210173
}
10173-
/* line 140, ../scss/modules/select.scss */
10174+
/* line 141, ../scss/modules/select.scss */
1017410175
.husky-select-container.small .toggle-icon {
1017510176
line-height: 20px;
1017610177
}
10177-
/* line 143, ../scss/modules/select.scss */
10178+
/* line 144, ../scss/modules/select.scss */
1017810179
.husky-select-container.small .dropdown-list {
1017910180
top: 12px;
1018010181
min-width: 200px;
1018110182
max-width: 100%;
1018210183
border-radius: 2px;
1018310184
}
10184-
/* line 149, ../scss/modules/select.scss */
10185+
/* line 150, ../scss/modules/select.scss */
1018510186
.husky-select-container.small .dropdown-list.top {
1018610187
top: auto;
1018710188
bottom: -3px;
1018810189
}
10189-
/* line 157, ../scss/modules/select.scss */
10190+
/* line 158, ../scss/modules/select.scss */
1019010191
.husky-select-container.white .dropdown-label {
1019110192
background: #fff;
1019210193
}
10193-
/* line 163, ../scss/modules/select.scss */
10194+
/* line 164, ../scss/modules/select.scss */
1019410195
.husky-select-container.action .dropdown-label {
1019510196
background: #52B6CA;
1019610197
color: #fff;
1019710198
}
10198-
/* line 169, ../scss/modules/select.scss */
10199+
/* line 170, ../scss/modules/select.scss */
1019910200
.husky-select-container select {
1020010201
opacity: 0;
1020110202
position: absolute;

dist/husky.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52450,7 +52450,7 @@ define('husky_extensions/itemgrid',[],function() {
5245052450
};
5245152451

5245252452
app.core.dom.text = function(selector, value) {
52453-
if (!!value) {
52453+
if (!!value || value === '') {
5245452454
return $(selector).text(value);
5245552455
} else {
5245652456
return $(selector).text();

dist/husky.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/husky.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

husky_extensions/jquery.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
};
313313

314314
app.core.dom.text = function(selector, value) {
315-
if (!!value) {
315+
if (!!value || value === '') {
316316
return $(selector).text(value);
317317
} else {
318318
return $(selector).text();

scss/modules/select.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
}
4949

5050
.husky-select-label {
51+
min-height: 30px;
5152
overflow: hidden;
5253
text-overflow: ellipsis;
5354
white-space: nowrap;

0 commit comments

Comments
 (0)