diff options
| author | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-13 11:59:19 -0800 |
| commit | 90d0c8c0e98d062c628c061fe5765ce991fda409 (patch) | |
| tree | 9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/panels/Timeline/Style.reel/Style.html | |
| parent | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts:
css/ninja.css
js/stage/stage.reel/stage.html
js/tools/TextTool.js
node_modules/labs/rich-text-editor.reel/rich-text-editor.css
node_modules/labs/rich-text-editor.reel/rich-text-editor.html
node_modules/labs/rich-text-editor.reel/rich-text-editor.js
node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.html')
| -rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html new file mode 100644 index 00000000..c6f29626 --- /dev/null +++ b/js/panels/Timeline/Style.reel/Style.html | |||
| @@ -0,0 +1,91 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <html lang="en"> | ||
| 3 | <head> | ||
| 4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 5 | <link rel="stylesheet" type="text/css" href="css/Style.css"> | ||
| 6 | <script type="text/montage-serialization"> | ||
| 7 | { | ||
| 8 | "owner": { | ||
| 9 | "module": "js/panels/Timeline/Style.reel", | ||
| 10 | "name": "Style", | ||
| 11 | "properties": { | ||
| 12 | "element": {"#": "style-container"}, | ||
| 13 | "styleContainer" : {"#" : "style-container"}, | ||
| 14 | "styleHintable" : {"#" : "style-hintable"}, | ||
| 15 | "styleProperty" : {"#": "container-property"}, | ||
| 16 | "valueEditorHottext" : {"@":"hottextunit"}, | ||
| 17 | "dtextProperty" : {"@":"dtext1"}, | ||
| 18 | "myHintable" : {"@" :"hintable"} | ||
| 19 | } | ||
| 20 | }, | ||
| 21 | "dtext1" : { | ||
| 22 | "module" : "montage/ui/dynamic-text.reel", | ||
| 23 | "name" : "DynamicText", | ||
| 24 | "properties" : { | ||
| 25 | "element" : {"#" : "container-property"} | ||
| 26 | }, | ||
| 27 | "bindings" : { | ||
| 28 | "value" : { | ||
| 29 | "boundObject" : {"@" : "owner"}, | ||
| 30 | "boundObjectPropertyPath" : "editorProperty", | ||
| 31 | "oneway" : false | ||
| 32 | } | ||
| 33 | } | ||
| 34 | }, | ||
| 35 | "hottextunit" : { | ||
| 36 | "module" : "js/components/hottextunit.reel", | ||
| 37 | "name" : "HotTextUnit", | ||
| 38 | "properties" : { | ||
| 39 | "element" : {"#":"value-editor-hottext"} | ||
| 40 | }, | ||
| 41 | "bindings" : { | ||
| 42 | "value" : { | ||
| 43 | "boundObject" : {"@" : "owner"}, | ||
| 44 | "boundObjectPropertyPath" : "editorValue", | ||
| 45 | "oneway" : false | ||
| 46 | } | ||
| 47 | } | ||
| 48 | }, | ||
| 49 | "hintable" : { | ||
| 50 | "module" : "js/components/hintable.reel", | ||
| 51 | "name" : "Hintable", | ||
| 52 | "properties" : { | ||
| 53 | "element" : {"#":"style-hintable"} | ||
| 54 | }, | ||
| 55 | "bindings" : { | ||
| 56 | "value" : { | ||
| 57 | "boundObject" : {"@" : "owner"}, | ||
| 58 | "boundObjectPropertyPath" : "editorProperty", | ||
| 59 | "oneway" : false | ||
| 60 | } | ||
| 61 | } | ||
| 62 | } | ||
| 63 | } | ||
| 64 | </script> | ||
| 65 | </head> | ||
| 66 | <body> | ||
| 67 | <div id="style-container"> | ||
| 68 | <div class="style-padding"> | ||
| 69 | <div class="row-hintable hidden"> | ||
| 70 | <div id="style-hintable"></div> | ||
| 71 | </div> | ||
| 72 | <div class="container-propvals hidden"> | ||
| 73 | <div class="cell-property"> | ||
| 74 | <div id="container-property">property</div> | ||
| 75 | </div> | ||
| 76 | <div class="cell-value value-editor editor-hottext hidden"> | ||
| 77 | <div id="value-editor-hottext"></div> | ||
| 78 | </div> | ||
| 79 | <div class="cell-value value-editor editor-color hidden"> | ||
| 80 | <div id="value-editor-color">[ ]</div> | ||
| 81 | </div> | ||
| 82 | <div class="cell-value value-editor editor-input hidden"> | ||
| 83 | <!-- <div id="value-editor-input"></div> --> | ||
| 84 | <input type="text" class="nj-skinned" value="" /> | ||
| 85 | </div> | ||
| 86 | </div> | ||
| 87 | |||
| 88 | </div> | ||
| 89 | </div> | ||
| 90 | </body> | ||
| 91 | </html> \ No newline at end of file | ||