diff options
Diffstat (limited to 'js/panels/properties.reel')
9 files changed, 89 insertions, 131 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html index d212ae80..3a1ae880 100755 --- a/js/panels/properties.reel/properties.html +++ b/js/panels/properties.reel/properties.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/> |
@@ -27,8 +27,7 @@ | |||
27 | }, | 27 | }, |
28 | 28 | ||
29 | "elementClass": { | 29 | "elementClass": { |
30 | "module": "montage/ui/textfield.reel", | 30 | "prototype": "montage/ui/textfield.reel", |
31 | "name": "Textfield", | ||
32 | "properties": { | 31 | "properties": { |
33 | "element": {"#": "elementClass"}, | 32 | "element": {"#": "elementClass"}, |
34 | "readOnly": false | 33 | "readOnly": false |
@@ -36,8 +35,7 @@ | |||
36 | }, | 35 | }, |
37 | 36 | ||
38 | "PosSizeSection": { | 37 | "PosSizeSection": { |
39 | "module": "js/panels/properties.reel/section.reel", | 38 | "prototype": "js/panels/properties.reel/section.reel", |
40 | "name": "Section", | ||
41 | "properties": { | 39 | "properties": { |
42 | "element": {"#": "PosSize"}, | 40 | "element": {"#": "PosSize"}, |
43 | "content" : {"@": "PosSize"}, | 41 | "content" : {"@": "PosSize"}, |
@@ -45,12 +43,10 @@ | |||
45 | } | 43 | } |
46 | }, | 44 | }, |
47 | "PosSize": { | 45 | "PosSize": { |
48 | "module": "js/panels/properties.reel/sections/position-and-size.reel", | 46 | "prototype": "js/panels/properties.reel/sections/position-and-size.reel[PosSize]" |
49 | "name": "PosSize" | ||
50 | }, | 47 | }, |
51 | "threeDSection": { | 48 | "threeDSection": { |
52 | "module": "js/panels/properties.reel/section.reel", | 49 | "prototype": "js/panels/properties.reel/section.reel", |
53 | "name": "Section", | ||
54 | "properties": { | 50 | "properties": { |
55 | "element": {"#": "threeD"}, | 51 | "element": {"#": "threeD"}, |
56 | "content" : {"@": "threeDProperties"}, | 52 | "content" : {"@": "threeDProperties"}, |
@@ -58,13 +54,11 @@ | |||
58 | } | 54 | } |
59 | }, | 55 | }, |
60 | "threeDProperties": { | 56 | "threeDProperties": { |
61 | "module": "js/panels/properties.reel/sections/three-d-view.reel", | 57 | "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]" |
62 | "name": "ThreeD" | ||
63 | }, | 58 | }, |
64 | 59 | ||
65 | "CustomSections": { | 60 | "CustomSections": { |
66 | "module": "montage/ui/repetition.reel", | 61 | "prototype": "montage/ui/repetition.reel", |
67 | "name": "Repetition", | ||
68 | "properties": { | 62 | "properties": { |
69 | "element": {"#": "customSections"} | 63 | "element": {"#": "customSections"} |
70 | }, | 64 | }, |
@@ -78,8 +72,7 @@ | |||
78 | }, | 72 | }, |
79 | 73 | ||
80 | "customSection": { | 74 | "customSection": { |
81 | "module": "js/panels/properties.reel/section.reel", | 75 | "prototype": "js/panels/properties.reel/section.reel", |
82 | "name": "Section", | ||
83 | "properties": { | 76 | "properties": { |
84 | "element": {"#": "customSection"} | 77 | "element": {"#": "customSection"} |
85 | }, | 78 | }, |
@@ -98,8 +91,7 @@ | |||
98 | }, | 91 | }, |
99 | 92 | ||
100 | "owner": { | 93 | "owner": { |
101 | "module": "js/panels/properties.reel", | 94 | "prototype": "js/panels/properties.reel", |
102 | "name": "Properties", | ||
103 | "properties": { | 95 | "properties": { |
104 | "element": {"#": "propertiesPanel"}, | 96 | "element": {"#": "propertiesPanel"}, |
105 | "elementName": {"@": "elementName"}, | 97 | "elementName": {"@": "elementName"}, |
@@ -113,26 +105,26 @@ | |||
113 | </script> | 105 | </script> |
114 | </head> | 106 | </head> |
115 | <body> | 107 | <body> |
116 | <section id="propertiesPanel" class="propertiesPanel"> | 108 | <section data-montage-id="propertiesPanel" class="propertiesPanel"> |
117 | <section class="sectional"> | 109 | <section class="sectional"> |
118 | <section class="fieldCol"> | 110 | <section class="fieldCol"> |
119 | <label>Element:</label> | 111 | <label>Element:</label> |
120 | <article class="fieldRow"><input type="text" id="elementName" class="nj-skinned" readonly="readonly"></article> | 112 | <article class="fieldRow"><input type="text" data-montage-id="elementName" class="nj-skinned" readonly="readonly"></article> |
121 | </section> | 113 | </section> |
122 | <section class="fieldCol"> | 114 | <section class="fieldCol"> |
123 | <label>ID:</label> | 115 | <label>ID:</label> |
124 | <article class="fieldRow"><input type="text" id="elementId" class="nj-skinned" /></article> | 116 | <article class="fieldRow"><input type="text" data-montage-id="elementId" class="nj-skinned" /></article> |
125 | </section> | 117 | </section> |
126 | <section class="fieldCol"> | 118 | <section class="fieldCol"> |
127 | <label>Class:</label> | 119 | <label>Class:</label> |
128 | <article class="fieldRow"><input type="text" id="elementClass" class="nj-skinned" /></article> | 120 | <article class="fieldRow"><input type="text" data-montage-id="elementClass" class="nj-skinned" /></article> |
129 | </section> | 121 | </section> |
130 | </section> | 122 | </section> |
131 | <section id="PosSize"></section> | 123 | <section data-montage-id="PosSize"></section> |
132 | <section id="customSections"> | 124 | <section data-montage-id="customSections"> |
133 | <div id="customSection"></div> | 125 | <div data-montage-id="customSection"></div> |
134 | </section> | 126 | </section> |
135 | <section id="threeD"></section> | 127 | <section data-montage-id="threeD"></section> |
136 | </section> | 128 | </section> |
137 | </body> | 129 | </body> |
138 | </html> \ No newline at end of file | 130 | </html> \ No newline at end of file |
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index b21014c1..507770f6 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js | |||
@@ -101,7 +101,6 @@ exports.Properties = Montage.create(Component, { | |||
101 | */ | 101 | */ |
102 | handleBlur: { | 102 | handleBlur: { |
103 | value: function(event) { | 103 | value: function(event) { |
104 | |||
105 | if(event.target.id === "elementId") { | 104 | if(event.target.id === "elementId") { |
106 | 105 | ||
107 | // Remove all white spaces from the id | 106 | // Remove all white spaces from the id |
@@ -126,6 +125,7 @@ exports.Properties = Montage.create(Component, { | |||
126 | ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "class", this.elementClass.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.elementClass); | 125 | ElementsMediator.setAttribute(this.application.ninja.currentDocument.documentRoot, "class", this.elementClass.value, "Change", "pi", this.application.ninja.currentDocument.documentRoot.elementModel.elementClass); |
127 | } | 126 | } |
128 | } | 127 | } |
128 | NJevent("updatedID",this.application.ninja.selectedElements[0]); | ||
129 | } | 129 | } |
130 | }, | 130 | }, |
131 | 131 | ||
@@ -174,6 +174,7 @@ exports.Properties = Montage.create(Component, { | |||
174 | handleSelectionChange: { | 174 | handleSelectionChange: { |
175 | value: function(event) { | 175 | value: function(event) { |
176 | if(event.detail.isDocument) { | 176 | if(event.detail.isDocument) { |
177 | if(this.application.ninja.currentDocument.documentRoot.nodeName.toLowerCase() === "body") return; | ||
177 | this.displayStageProperties(); | 178 | this.displayStageProperties(); |
178 | } else { | 179 | } else { |
179 | if(this.application.ninja.selectedElements.length === 1) { | 180 | if(this.application.ninja.selectedElements.length === 1) { |
@@ -207,11 +208,7 @@ exports.Properties = Montage.create(Component, { | |||
207 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); | 208 | this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); |
208 | } | 209 | } |
209 | 210 | ||
210 | if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") { | 211 | this.threeD.flatten = ElementsMediator.getProperty(stage, "-webkit-transform-style") !== "preserve-3d"; |
211 | this.threeD.flatten = false; | ||
212 | } else { | ||
213 | this.threeD.flatten = true; | ||
214 | } | ||
215 | 212 | ||
216 | if(this.customPi !== stage.elementModel.pi) { | 213 | if(this.customPi !== stage.elementModel.pi) { |
217 | // We need to unregister color chips from the previous selection from the Color Model | 214 | // We need to unregister color chips from the previous selection from the Color Model |
diff --git a/js/panels/properties.reel/section.reel/section.html b/js/panels/properties.reel/section.reel/section.html index b72a91b3..c9b14565 100755 --- a/js/panels/properties.reel/section.reel/section.html +++ b/js/panels/properties.reel/section.reel/section.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/panels/properties.reel/section.reel", | 12 | "prototype" : "js/panels/properties.reel/section.reel", |
13 | "name" : "Section", | ||
14 | "properties" : { | 13 | "properties" : { |
15 | "element" : {"#": "section"}, | 14 | "element" : {"#": "section"}, |
16 | "slot" : {"@": "sectionSlot"} | 15 | "slot" : {"@": "sectionSlot"} |
@@ -18,16 +17,14 @@ | |||
18 | }, | 17 | }, |
19 | 18 | ||
20 | "sectionSlot": { | 19 | "sectionSlot": { |
21 | "module": "montage/ui/slot.reel", | 20 | "prototype": "montage/ui/slot.reel", |
22 | "name" |