diff options
| author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
|---|---|---|
| committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
| commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
| tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components | |
| parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz | |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components')
69 files changed, 1354 insertions, 727 deletions
diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html deleted file mode 100755 index ded91fc2..00000000 --- a/js/components/checkbox.reel/checkbox.html +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 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/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html> | ||
| 8 | <head> | ||
| 9 | <script type="text/montage-serialization"> | ||
| 10 | { | ||
| 11 | "owner": { | ||
| 12 | "prototype": "js/components/checkbox.reel", | ||
| 13 | "properties": { | ||
| 14 | "element": {"#": "ch_comp"} | ||
| 15 | } | ||
| 16 | } | ||
| 17 | } | ||
| 18 | </script> | ||
| 19 | </head> | ||
| 20 | <body> | ||
| 21 | <input data-montage-id="ch_comp" class="nj-skinned" type="checkbox"> | ||
| 22 | </body> | ||
| 23 | </html> \ No newline at end of file | ||
diff --git a/js/components/checkbox.reel/checkbox.js b/js/components/checkbox.reel/checkbox.js deleted file mode 100755 index be331f4e..00000000 --- a/js/components/checkbox.reel/checkbox.js +++ /dev/null | |||
| @@ -1,120 +0,0 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 7 | var Montage = require("montage/core/core").Montage; | ||
| 8 | var Component = require("montage/ui/component").Component; | ||
| 9 | |||
| 10 | exports.Checkbox = Montage.create(Component, { | ||
| 11 | |||
| 12 | _valueSyncedWithInputField: { | ||
| 13 | enumerable: false, | ||
| 14 | value: false | ||
| 15 | }, | ||
| 16 | |||
| 17 | _wasSetByCode: { | ||
| 18 | enumerable: false, | ||
| 19 | value: true | ||
| 20 | }, | ||
| 21 | |||
| 22 | prependLabel: { | ||
| 23 | value: false | ||
| 24 | }, | ||
| 25 | |||
| 26 | label: { | ||
| 27 | value: null | ||
| 28 | }, | ||
| 29 | |||
| 30 | value: { | ||
| 31 | value: false | ||
| 32 | }, | ||
| 33 | |||
| 34 | _checked: { | ||
| 35 | enumerable: false, | ||
| 36 | value: false | ||
| 37 | }, | ||
| 38 | |||
| 39 | checked: { | ||
| 40 | enumerable: true, | ||
| 41 | serializable: true, | ||
| 42 | get: function() { | ||
| 43 | return this._checked; | ||
| 44 | }, | ||
| 45 | set: function(value) { | ||
| 46 | this._checked = value; | ||
| 47 | this.needsDraw = true; | ||
| 48 | |||
| 49 | var e = document.createEvent("CustomEvent"); | ||
| 50 | e.initEvent("change", true, true); | ||
| 51 | e.type = "change"; | ||
| 52 | e.wasSetByCode = this._wasSetByCode; | ||
| 53 | e.value = value; | ||
| 54 | this.value = value; | ||
| 55 | this.dispatchEvent(e); | ||
| 56 | |||
| 57 | this._wasSetByCode = true; | ||
| 58 | } | ||
| 59 | }, | ||
| 60 | |||
| 61 | _enabled: { | ||
| 62 | enumerable: false, | ||
| 63 | value: true | ||
| 64 | }, | ||
| 65 | |||
| 66 | enabled: { | ||
| 67 | enumerable: true, | ||
| 68 | serializable: true, | ||
| 69 | get: function() { | ||
| 70 | return this._enabled; | ||
| 71 | }, | ||
| 72 | set: function(value) { | ||