diff options
| author | hwc487 | 2012-01-31 10:46:48 -0800 |
|---|---|---|
| committer | hwc487 | 2012-01-31 10:46:48 -0800 |
| commit | aa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260 (patch) | |
| tree | 9fd0364c371b8c9bbe1620b9a5a58a45dd0574a9 /js/components/combobox.reel | |
| parent | 0b8d8b2eb595b64ef53440b949f3c5ec891daf8a (diff) | |
| parent | 6066b9bda2990c9d6b4311d221b0d0c773b20f60 (diff) | |
| download | ninja-aa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260.tar.gz | |
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts:
js/stage/stage.reel/stage.js
Diffstat (limited to 'js/components/combobox.reel')
| -rw-r--r-- | js/components/combobox.reel/combobox.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js index f262bb06..a68a7d6b 100644 --- a/js/components/combobox.reel/combobox.js +++ b/js/components/combobox.reel/combobox.js | |||
| @@ -67,7 +67,7 @@ exports.Combobox = Montage.create(Component, { | |||
| 67 | var e = document.createEvent("CustomEvent"); | 67 | var e = document.createEvent("CustomEvent"); |
| 68 | e.initEvent("change", true, true); | 68 | e.initEvent("change", true, true); |
| 69 | e.type = "change"; | 69 | e.type = "change"; |
| 70 | e._wasSetByCode = this._wasSetByCode; | 70 | e.wasSetByCode = this._wasSetByCode; |
| 71 | e.value = this._value; | 71 | e.value = this._value; |
| 72 | this.dispatchEvent(e); | 72 | this.dispatchEvent(e); |
| 73 | 73 | ||