diff options
Diffstat (limited to 'js/components/combobox.reel/combobox.js')
-rwxr-xr-x | js/components/combobox.reel/combobox.js | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js index 4effc686..76a9a3e6 100755 --- a/js/components/combobox.reel/combobox.js +++ b/js/components/combobox.reel/combobox.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -80,7 +81,7 @@ exports.Combobox = Montage.create(Component, { | |||
80 | } | 81 | } |
81 | } | 82 | } |
82 | }, | 83 | }, |
83 | 84 | ||
84 | _value: { | 85 | _value: { |
85 | enumerable: false, | 86 | enumerable: false, |
86 | value: null | 87 | value: null |
@@ -153,12 +154,12 @@ exports.Combobox = Montage.create(Component, { | |||
153 | handleChange: | 154 | handleChange: |
154 | { | 155 | { |
155 | value:function(event) | 156 | value:function(event) |
156 | { | 157 | { |
157 | this._valueSyncedWithInputField = true; | 158 | this._valueSyncedWithInputField = true; |
158 | this._wasSetByCode = false; | 159 | this._wasSetByCode = false; |
159 | this.value = this.element.value; | 160 | this.value = this.element.value; |
160 | this.needsDraw = true; | 161 | this.needsDraw = true; |
161 | } | 162 | } |
162 | }, | 163 | }, |
163 | 164 | ||
164 | willDraw: { | 165 | willDraw: { |
@@ -166,7 +167,7 @@ exports.Combobox = Montage.create(Component, { | |||
166 | if(!this._valueSyncedWithInputField) | 167 | if(!this._valueSyncedWithInputField) |
167 | { | 168 | { |
168 | this.element.innerHTML = ""; | 169 | this.element.innerHTML = ""; |
169 | 170 | ||
170 | var optionItem = document.createElement("option"); | 171 | var optionItem = document.createElement("option"); |
171 | var items = this._items; | 172 | var items = this._items; |
172 | var len = items.length; | 173 | var len = items.length; |