fix #428

yandex-ui · Sep 29, 2014 · f92711a · f92711a
1 parent 7349037
commit f92711a
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/blocks/select/select.example.yate b/blocks/select/select.example.yate
@@ -1,6 +1,22 @@
 func selects() {
 
     selects-theme = (
+     nb-select({
+              'id': 'select-texttext'
+              'items': [
+                  {
+                      'value': ''
+                      'text': 'Text'
+                      'selected': false()
+                  }
+                  {
+                      'value': 'whatever'
+                      'text': 'Text'
+                      'selected': false()
+                  }
+              ]
+          })
+
         nb-select({
             'size': 'm'
             'id': 'select1'
@@ -311,4 +327,6 @@ func selects() {
             }
         ]
       }))
+
+
 }
diff --git a/blocks/select/select.js b/blocks/select/select.js
@@ -360,9 +360,9 @@ nb.define('select', {
                 var selected;
 
                 if (params.value) {
-                    selected = this.$control.find('option[value="' + params.value + '"]');
+                    selected = this.$control.find('option[value="' + params.value + '"]').first();
                 } else {
-                    selected = this.$control.find('option:contains(' + params.text + ')');
+                    selected = this.$control.find('option:contains(' + params.text + ')').first();
                 }
 
                 if (selected.length !== 0) {

diff --git a/unittests/spec/select/select.js b/unittests/spec/select/select.js
@@ -604,6 +604,12 @@ describe("Select Tests", function() {
                 expect(flag).to.equal(1);
             });
 
+
+            it("#422", function() {
+                nb.find('select-texttext').setState({'text': 'Text'});
+                expect(nb.find('select-texttext').$node.find('._nb-button-content').html()).to.equal('Text');
+            });
+
             it("XSS in _setText", function() {
                 this.select.addToSource({
                     'selected': true,

diff --git a/unittests/spec/select/select.yate b/unittests/spec/select/select.yate
@@ -150,5 +150,22 @@ nb-select({
 })
 
 
+nb-select({
+    'id': 'select-texttext'
+    'items': [
+        {
+            'value': ''
+            'text': 'Text'
+            'selected': false()
+        }
+        {
+            'value': 'whatever'
+            'text': 'Text'
+            'selected': false()
+        }
+    ]
+})
+
+
 
 }