diff options
| author | Jose Antonio Marquez | 2012-02-11 22:33:26 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-11 22:33:26 -0800 |
| commit | c6ed3331e88eb01a52ac533e5449df3af2fb5965 (patch) | |
| tree | 2b660dc94a98bad02b46ba44a28424d692435fb3 /js | |
| parent | 5d38e575b2bafeae9bd676247fce15ec5f78fa32 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-c6ed3331e88eb01a52ac533e5449df3af2fb5965.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js')
126 files changed, 9312 insertions, 5134 deletions
diff --git a/js/components/button.reel/button.js b/js/components/button.reel/button.js index ce5ac1af..2d26c8b4 100644 --- a/js/components/button.reel/button.js +++ b/js/components/button.reel/button.js | |||
| @@ -179,7 +179,7 @@ var Button = exports.Button = Montage.create(Component, { | |||
| 179 | value: function() { | 179 | value: function() { |
| 180 | if(this.isToggleButton) | 180 | if(this.isToggleButton) |
| 181 | { | 181 | { |
| 182 | if(this._value) | 182 | if(this._value === true) |
| 183 | { | 183 | { |
| 184 | this.element.classList.remove(this.offState); | 184 | this.element.classList.remove(this.offState); |
| 185 | this.element.classList.add(this.onState); | 185 | this.element.classList.add(this.onState); |
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js new file mode 100644 index 00000000..1d0ad776 --- /dev/null +++ b/js/components/editable.reel/editable.js | |||
| @@ -0,0 +1,250 @@ | |||
| 1 | /* ComputedStyleSubPanel.js */ | ||
| 2 | var Montage = require("montage").Montage, | ||
| 3 | Component = require("montage/ui/component").Component; | ||
| 4 | |||
| 5 | |||
| 6 | /* | ||
| 7 | |||
| 8 | EDITABLE - Methods | ||
| 9 | - startEdit | ||