diff options
| author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
| commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
| tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/components | |
| parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
| parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
| download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/components')
61 files changed, 259 insertions, 420 deletions
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html index 7142d605..1f41699e 100644 --- a/js/components/about-box.reel/about-box.html +++ b/js/components/about-box.reel/about-box.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -12,8 +12,7 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "owner": { | 14 | "owner": { |
| 15 | "module": "js/components/about-box.reel", | 15 | "prototype": "js/components/about-box.reel", |
| 16 | "name": "AboutBox", | ||
| 17 | "properties": { | 16 | "properties": { |
| 18 | "element": {"#": "mainAboutBoxContainer"} | 17 | "element": {"#": "mainAboutBoxContainer"} |
| 19 | } | 18 | } |
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html index 3d523a98..a03d72fb 100755 --- a/js/components/checkbox.reel/checkbox.html +++ b/js/components/checkbox.reel/checkbox.html | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
| 10 | { | 10 | { |
| 11 | "owner": { | 11 | "owner": { |
| 12 | "module": "js/components/checkbox.reel", | 12 | "prototype": "js/components/checkbox.reel", |
| 13 | "name": "Checkbox", | ||
| 14 | "properties": { | 13 | "properties": { |
| 15 | "element": {"#": "ch_comp"} | 14 | "element": {"#": "ch_comp"} |
| 16 | } | 15 | } |
diff --git a/js/components/colorbar.reel/colorbar.html b/js/components/colorbar.reel/colorbar.html index f74f1437..c5bc186a 100755 --- a/js/components/colorbar.reel/colorbar.html +++ b/js/components/colorbar.reel/colorbar.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- | 2 | <!-- |
| 3 | <copyright> | 3 | <copyright> |
| 4 | This file contains proprietary software owned by Motorola Mobility, Inc. | 4 | This file contains proprietary software owned by Motorola Mobility, Inc. |
| @@ -16,8 +16,7 @@ | |||
| 16 | <script type="text/montage-serialization"> | 16 | <script type="text/montage-serialization"> |
| 17 | { | 17 | { |
| 18 | "owner": { | 18 | "owner": { |
| 19 | "module": "js/components/colorbar.reel", | 19 | "prototype": "js/components/colorbar.reel[ColorBar]", |
| 20 | "name": "ColorBar", | ||
| 21 | "properties": { | 20 | "properties": { |
| 22 | "element": {"#": "colorbar"} | 21 | "element": {"#": "colorbar"} |
| 23 | 22 | ||
diff --git a/js/components/colorwheel.reel/colorwheel.html b/js/components/colorwheel.reel/colorwheel.html index a9fbfbd9..ef955c2d 100755 --- a/js/components/colorwheel.reel/colorwheel.html +++ b/js/components/colorwheel.reel/colorwheel.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
| 2 | <!-- | 2 | <!-- |
| 3 | <copyright> | 3 | <copyright> |
| 4 | This file contains proprietary software owned by Motorola Mobility, Inc. | 4 | This file contains proprietary software owned by Motorola Mobility, Inc. |
| @@ -16,8 +16,7 @@ | |||
| 16 | <script type="text/montage-serialization"> | 16 | <script type="text/montage-serialization"> |
| 17 | { | 17 | { |
| 18 | "owner": { | 18 | "owner": { |
| 19 | "module": "js/components/colorwheel.reel", | 19 | "prototype": "js/components/colorwheel.reel[ColorWheel]", |
| 20 | "name": "ColorWheel", | ||
| 21 | "properties": { | 20 | "properties": { |
| 22 | "element": {"#": "colorwheel"} | 21 | "element": {"#": "colorwheel"} |
| 23 | 22 | ||
diff --git a/js/components/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html index d78cc9c1..a68dd37f 100755 --- a/js/components/combobox.reel/combobox.html +++ b/js/components/combobox.reel/combobox.html | |||
| @@ -9,8 +9,7 @@ | |||
| 9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
| 10 | { | 10 | { |
| 11 | "owner": { | 11 | "owner": { |
| 12 | "module": "js/components/combobox.reel", | 12 | "prototype": "js/components/combobox.reel", |
| 13 | "name": "Combobox", | ||
| 14 | "properties": { | 13 | "properties": { |
| 15 | "element": {"#": "cb_comp"} | 14 | "element": {"#": "cb_comp"} |
| 16 | } | 15 | } |
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js index 9c8946c4..dad93b31 100644 --- a/js/components/editable.reel/editable.js +++ b/js/components/editable.reel/editable.js | |||
| @@ -38,6 +38,7 @@ exports.Editable = Montage.create(Component, { | |||
| 38 | set : function(el) { | 38 | set : function(el) { |
| 39 | this._element = el; | 39 | this._element = el; |
| 40 | this._element.addEventListener('keydown', this, false); | 40 | this._element.addEventListener('keydown', this, false); |
| 41 | this._element.addEventListener('keyup', this, false); | ||
| 41 | this._element.addEventListener('input', this, false); | 42 | this._element.addEventListener('input', this, false); |
| 42 | 43 | ||
| 43 | if(this.startOnEvent) { | 44 | if(this.startOnEvent) { |
| @@ -115,12 +116,15 @@ exports.Editable = Montage.create(Component, { | |||
| 115 | ///// Save the preEditValue | 116 | ///// Save the preEditValue |
| 116 | this._preEditValue = this.value; | 117 | this._preEditValue = this.value; |
| 117 | 118 | ||