diff options
| author | John Mayhew | 2012-02-10 16:04:19 -0800 |
|---|---|---|
| committer | John Mayhew | 2012-02-10 16:04:19 -0800 |
| commit | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch) | |
| tree | c86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js | |
| parent | cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/ninja.reel/ninja.html
Diffstat (limited to 'js')
118 files changed, 8796 insertions, 2823 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 | ||
| 10 | - stopEdit | ||
| 11 | - value | ||
| 12 | - | ||
| 13 | - _suggest | ||
| 14 | - _suggestNext | ||
| 15 | - _suggestPrev | ||
| 16 | - _clearSuggest | ||
| 17 | |||