diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/Timeline/Style.reel | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/panels/Timeline/Style.reel')
| -rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 12 | ||||
| -rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index 9fb098de..5be159c3 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.html | |||
| @@ -65,23 +65,23 @@ | |||
| 65 | </script> | 65 | </script> |
| 66 | </head> | 66 | </head> |
| 67 | <body> | 67 | <body> |
| 68 | <div id="style-container"> | 68 | <div data-montage-id="style-container"> |
| 69 | <div class="style-padding"> | 69 | <div class="style-padding"> |
| 70 | <div class="row-hintable hidden"> | 70 | <div class="row-hintable hidden"> |
| 71 | <div id="style-hintable"></div> | 71 | <div data-montage-id="style-hintable"></div> |
| 72 | </div> | 72 | </div> |
| 73 | <div class="container-propvals hidden"> | 73 | <div class="container-propvals hidden"> |
| 74 | <div class="cell-property"> | 74 | <div class="cell-property"> |
| 75 | <div id="container-property">property</div> | 75 | <div data-montage-id="container-property">property</div> |
| 76 | </div> | 76 | </div> |
| 77 | <div class="cell-value value-editor editor-hottext hidden"> | 77 | <div class="cell-value value-editor editor-hottext hidden"> |
| 78 | <div id="value-editor-hottext"></div> | 78 | <div data-montage-id="value-editor-hottext"></div> |
| 79 | </div> | 79 | </div> |
| 80 | <div class="cell-value value-editor editor-color hidden"> | 80 | <div class="cell-value value-editor editor-color hidden"> |
| 81 | <div id="value-editor-color">[ ]</div> | 81 | <div data-montage-id="value-editor-color">[ ]</div> |
| 82 | </div> | 82 | </div> |
| 83 | <div class="cell-value value-editor editor-input hidden"> | 83 | <div class="cell-value value-editor editor-input hidden"> |
| 84 | <!-- <div id="value-editor-input"></div> --> | 84 | <!-- <div data-montage-id="value-editor-input"></div> --> |
| 85 | <input type="text" class="nj-skinned" value="" /> | 85 | <input type="text" class="nj-skinned" value="" /> |
| 86 | </div> | 86 | </div> |
| 87 | </div> | 87 | </div> |
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index 027f3a40..c39f3a56 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js | |||
| @@ -27,7 +27,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
| 27 | /* === BEGIN: Models === */ | 27 | /* === BEGIN: Models === */ |
| 28 | // isSelected: whether or not the style is selected | 28 | // isSelected: whether or not the style is selected |
| 29 | _isSelected: { | 29 | _isSelected: { |
| 30 | serializable: true, | ||
| 31 | value: false | 30 | value: false |
| 32 | }, | 31 | }, |
| 33 | isSelected: { | 32 | isSelected: { |
| @@ -60,7 +59,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
| 60 | 59 | ||
| 61 | // Property for this editor | 60 | // Property for this editor |
| 62 | _editorProperty: { | 61 | _editorProperty: { |
| 63 | serializable: true, | ||
| 64 | value: "" | 62 | value: "" |
| 65 | }, | 63 | }, |
| 66 | editorProperty: { | 64 | editorProperty: { |
| @@ -76,7 +74,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
| 76 | 74 | ||
| 77 | // Value for the property for this editor. | 75 | // Value for the property for this editor. |
| 78 | _editorValue: { | 76 | _editorValue: { |
| 79 | serializable: true, | ||
| 80 | value: "" | 77 | value: "" |
| 81 | }, | 78 | }, |
| 82 | editorValue: { | 79 | editorValue: { |
| @@ -92,7 +89,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
| 92 | 89 | ||
| 93 | // The tweener used to change the value for this property. | 90 | // The tweener used to change the value for this property. |
| 94 | _ruleTweener: { | 91 | _ruleTweener: { |
| 95 | serializable: true, | ||
| 96 | value: false | 92 | value: false |
| 97 | }, | 93 | }, |
| 98 | ruleTweener: { | 94 | ruleTweener: { |
| @@ -137,7 +133,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
| 137 | 133 | ||
| 138 | // whichView: which view should we show: hintable or propval | 134 | // whichView: which view should we show: hintable or propval |
| 139 | _whichView : { | 135 | _whichView : { |
| 140 | serializable: true, | ||
| 141 | value: "hintable" | 136 | value: "hintable" |
| 142 | }, | 137 | }, |
| 143 | whichView: { | 138 | whichView: { |
| @@ -161,7 +156,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { | |||
| 161 | // styleID: the id for this style; | 156 | // styleID: the id for this style; |
| 162 | // Used to publish events | 157 | // Used to publish events |
| 163 | _styleID : { | 158 | _styleID : { |
| 164 | serializable: true, | ||
| 165 | value: null | 159 | value: null |
| 166 | }, | 160 | }, |
| 167 | styleID: { | 161 | styleID: { |