Skip to content

Commit 2699521

Browse files
committed
4.0.0-beta.11 release
1 parent c568afc commit 2699521

32 files changed

+114
-40
lines changed

packages/core/components/smart-select.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.

packages/core/components/smart-select/smart-select-class.js

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class SmartSelect extends Framework7Class {
7777
const value = ss.$selectEl.val();
7878
ss.$el.trigger('smartselect:change', ss, value);
7979
ss.emit('local::change smartSelectChange', ss, value);
80-
ss.setValue();
80+
ss.setTextValue();
8181
}
8282
ss.attachEvents = function attachEvents() {
8383
$el.on('click', onClick);
@@ -141,6 +141,43 @@ class SmartSelect extends Framework7Class {
141141
return ss;
142142
}
143143

144+
setValue(value) {
145+
const ss = this;
146+
let newValue = value;
147+
let optionText = [];
148+
let optionEl;
149+
let displayAs;
150+
let text;
151+
if (ss.multiple) {
152+
if (!Array.isArray(newValue)) newValue = [newValue];
153+
for (let i = 0; i < ss.selectEl.options.length; i += 1) {
154+
optionEl = ss.selectEl.options[i];
155+
if (newValue.indexOf(optionEl.value) >= 0) {
156+
optionEl.selected = true;
157+
} else {
158+
optionEl.selected = false;
159+
}
160+
if (optionEl.selected) {
161+
displayAs = optionEl.dataset ? optionEl.dataset.displayAs : $(optionEl).data('display-value-as');
162+
text = displayAs && typeof displayAs !== 'undefined' ? displayAs : optionEl.textContent;
163+
optionText.push(text.trim());
164+
}
165+
}
166+
} else {
167+
optionEl = ss.$selectEl.find(`option[value="${newValue}"]`)[0];
168+
displayAs = optionEl.dataset ? optionEl.dataset.displayAs : $(optionEl).data('display-as');
169+
text = displayAs && typeof displayAs !== 'undefined' ? displayAs : optionEl.textContent;
170+
optionText = [text];
171+
ss.selectEl.value = newValue;
172+
}
173+
ss.$valueEl.text(optionText.join(', '));
174+
}
175+
176+
getValue() {
177+
const ss = this;
178+
return ss.$selectEl.val();
179+
}
180+
144181
getView() {
145182
const ss = this;
146183
let view = ss.view || ss.params.view;
@@ -170,7 +207,7 @@ class SmartSelect extends Framework7Class {
170207
}
171208
}
172209

173-
setValue(value) {
210+
setTextValue(value) {
174211
const ss = this;
175212
let valueArray = [];
176213
if (typeof value !== 'undefined') {
@@ -712,7 +749,7 @@ class SmartSelect extends Framework7Class {
712749
init() {
713750
const ss = this;
714751
ss.attachEvents();
715-
ss.setValue();
752+
ss.setTextValue();
716753
}
717754

718755
destroy() {

packages/core/css/framework7.bundle.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Framework7 4.0.0-beta.10
2+
* Framework7 4.0.0-beta.11
33
* Full featured mobile HTML framework for building iOS & Android apps
44
* http://framework7.io/
55
*

packages/core/css/framework7.bundle.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.

packages/core/css/framework7.bundle.rtl.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Framework7 4.0.0-beta.10
2+
* Framework7 4.0.0-beta.11
33
* Full featured mobile HTML framework for building iOS & Android apps
44
* http://framework7.io/
55
*

packages/core/css/framework7.bundle.rtl.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.

packages/core/css/framework7.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Framework7 4.0.0-beta.10
2+
* Framework7 4.0.0-beta.11
33
* Full featured mobile HTML framework for building iOS & Android apps
44
* http://framework7.io/
55
*

packages/core/css/framework7.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.

packages/core/css/framework7.rtl.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Framework7 4.0.0-beta.10
2+
* Framework7 4.0.0-beta.11
33
* Full featured mobile HTML framework for building iOS & Android apps
44
* http://framework7.io/
55
*

packages/core/css/framework7.rtl.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.

0 commit comments

Comments
 (0)