diff options
author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/panels/properties.reel/sections | |
parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections')
-rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | 10 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js | 3 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/custom.reel/custom.js | 20 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/position-size.reel/position-size.css (renamed from js/panels/properties.reel/sections/position-and-size.reel/position-and-size.css) | 0 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/position-size.reel/position-size.html (renamed from js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html) | 36 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/position-size.reel/position-size.js (renamed from js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js) | 22 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | 2 |
7 files changed, 44 insertions, 49 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html index bdcbff7f..c3af0668 100755 --- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | |||
@@ -22,10 +22,7 @@ | |||
22 | "element": { "#": "slotElement" } | 22 | "element": { "#": "slotElement" } |
23 | }, | 23 | }, |
24 | "bindings": { | 24 | "bindings": { |
25 | "content" : { | 25 | "content": {"<-": "@owner.content"} |
26 | "boundObject": {"@": "owner"}, | ||
27 | "boundObjectPropertyPath": "content" | ||
28 | } | ||
29 | } | 26 | } |
30 | }, | 27 | }, |
31 | "slot2": { | 28 | "slot2": { |
@@ -34,10 +31,7 @@ | |||
34 | "element": { "#": "slotElement2" } | 31 | "element": { "#": "slotElement2" } |
35 | }, | 32 | }, |
36 | "bindings": { | 33 | "bindings": { |
37 | "content" : { | 34 | "content": {"<-": "@owner.content2"} |
38 | "boundObject": {"@": "owner"}, | ||
39 | "boundObjectPropertyPath": "content2" | ||
40 | } | ||
41 | } | 35 | } |
42 | } | 36 | } |
43 | } | 37 | } |
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js index 4c5c80d7..2f81aa2e 100755 --- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js | |||
@@ -44,8 +44,7 @@ exports.DualRow = Montage.create(Component, { | |||
44 | } | 44 | } |
45 | if(this.label2 !== null) { | 45 | if(this.label2 !== null) { |
46 | if(this.content2.type === "button") { | 46 | if(this.content2.type === "button") { |
47 | this.content2.element = document.createElement("button"); | 47 | this.content2.label = this.label2; |
48 | this.content2.element.classList.add("nj-skinned"); | ||
49 | this.element.getElementsByClassName("lbl")[1].style.display = "none"; | 48 | this.element.getElementsByClassName("lbl")[1].style.display = "none"; |
50 | } else { | 49 | } else { |
51 | this.element.getElementsByClassName("lbl")[1].innerHTML = this.label2 + ":"; | 50 | this.element.getElementsByClassName("lbl")[1].innerHTML = this.label2 + ":"; |
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js index 876fe110..ae408f11 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
@@ -19,7 +19,7 @@ var HT = require("js/components/hottext.reel").HotText; | |||
19 | var Dropdown = require("js/components/combobox.reel").Combobox; | 19 | var Dropdown = require("js/components/combobox.reel").Combobox; |
20 | var TextField = require("js/components/textfield.reel").TextField; | 20 | var TextField = require("js/components/textfield.reel").TextField; |
21 | var FileInput = require("js/components/ui/file-input.reel").FileInput; | 21 | var FileInput = require("js/components/ui/file-input.reel").FileInput; |
22 | var Checkbox = require("js/components/checkbox.reel").Checkbox; | 22 | var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox; |
23 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; | 23 | var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; |
24 | var Button = require("montage/ui/button.reel").Button; | 24 | var Button = require("montage/ui/button.reel").Button; |
25 | 25 | ||
@@ -77,7 +77,7 @@ exports.CustomSection = Montage.create(Component, { | |||
77 | this.rows.push(tmpRow); | 77 | this.rows.push(tmpRow); |
78 | 78 | ||
79 | } else if(this._fields[i].length === 3) { | 79 | } else if(this._fields[i].length === 3) { |
80 | 80 | ||
81 | } | 81 | } |
82 | 82 | ||
83 | } | 83 | } |
@@ -103,7 +103,7 @@ exports.CustomSection = Montage.create(Component, { | |||
103 | handleChange: { | 103 | handleChange: { |
104 | value:function(event) { | 104 | value:function(event) { |
105 | if(event._event.wasSetByCode) return; | 105 | if(event._event.wasSetByCode) return; |
106 | 106 | ||
107 | var obj = event.currentTarget; | 107 | var obj = event.currentTarget; |
108 | this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); | 108 | this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); |
109 | } | 109 | } |
@@ -116,7 +116,7 @@ exports.CustomSection = Montage.create(Component, { | |||
116 | value: function(event) { | 116 | value: function(event) { |
117 | // Change the stage color for now | 117 | // Change the stage color for now |
118 | //console.log(this, event); | 118 | //console.log(this, event); |
119 | ElementsMediator.setProperty([this.application.ninja.currentDocument.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); | 119 | ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); |
120 | /* | 120 | /* |
121 | var propEvent = document.createEvent("CustomEvent"); | 121 | var propEvent = document.createEvent("CustomEvent"); |
122 | propEvent.initEvent("propertyChange", true, true); | 122 | propEvent.initEvent("propertyChange", true, true); |
@@ -262,10 +262,10 @@ exports.CustomSection = Montage.create(Component, { | |||
262 | if(aField.enabled.boundObject) { | 262 | if(aField.enabled.boundObject) { |
263 | // TODO - For now, always bind to this.controls[someProperty] | 263 | // TODO - For now, always bind to this.controls[someProperty] |
264 | Object.defineBinding(obj, "enabled", { | 264 | Object.defineBinding(obj, "enabled", { |
265 | boundObject: this.controls, | 265 | boundObject: this.controls, |
266 | boundObjectPropertyPath: aField.enabled.boundProperty, | 266 | boundObjectPropertyPath: aField.enabled.boundProperty, |
267 | oneway: false | 267 | oneway: false |
268 | }); | 268 | }); |
269 | } else { | 269 | } else { |
270 | obj.enabled = aField.enabled; | 270 | obj.enabled = aField.enabled; |
271 | } | 271 | } |
@@ -349,7 +349,7 @@ exports.CustomSection = Montage.create(Component, { | |||
349 | value: function(aField) { | 349 | value: function(aField) { |
350 | 350 | ||
351 | // Generate Textfield | 351 | // Generate Textfield |
352 | var obj = Checkbox.create(); | 352 | var obj = LabelCheckbox.create(); |
353 | 353 | ||
354 | // Set Values for TextField | 354 | // Set Values for TextField |
355 | if (aField.id) obj.id = aField.id; | 355 | if (aField.id) obj.id = aField.id; |
@@ -400,7 +400,7 @@ exports.CustomSection = Montage.create(Component, { | |||
400 | this.controls[aField.id] = obj; | 400 | this.controls[aField.id] = obj; |
401 | 401 | ||
402 | // TODO - Hack for now to reference the color select object to unregister color chips | 402 | // TODO - Hack for now to reference the color select object to unregister color chips |
403 | this.controls["stageBackground"] = obj; | 403 | this.controls["background"] = obj; |
404 | 404 | ||
405 | return obj; | 405 | return obj; |
406 | } | 406 | } |
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.css b/js/panels/properties.reel/sections/position-size.reel/position-size.css index 7f8fdbc2..7f8fdbc2 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.css +++ b/js/panels/properties.reel/sections/position-size.reel/position-size.css | |||
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-size.reel/position-size.html index a7aac84e..5d1a805a 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html +++ b/js/panels/properties.reel/sections/position-size.reel/position-size.html | |||
@@ -6,11 +6,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
6 | </copyright> --> | 6 | </copyright> --> |
7 | <html lang="en"> | 7 | <html lang="en"> |
8 | <head> | 8 | <head> |
9 | <link rel="stylesheet" href="position-and-size.css" type="text/css"> | 9 | <link rel="stylesheet" href="position-size.css" type="text/css"> |
10 | <script type="text/montage-serialization"> | 10 | <script type="text/montage-serialization"> |
11 | { | 11 | { |
12 | "owner": { | 12 | "owner": { |
13 | "prototype" : "js/panels/properties.reel/sections/position-and-size.reel[PosSize]", | 13 | "prototype" : "js/panels/properties.reel/sections/position-size.reel", |
14 | "properties" : { | 14 | "properties" : { |
15 | "element" : {"#": "section"}, | 15 | "element" : {"#": "section"}, |
16 | "position": {"#": "position"}, | 16 | "position": {"#": "position"}, |
@@ -23,6 +23,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
23 | "bindButton": {"@": "bindButton"} | 23 | "bindButton": {"@": "bindButton"} |
24 | } | 24 | } |
25 | }, | 25 | }, |
26 | |||
26 | "PosX": { | 27 | "PosX": { |
27 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 28 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
28 | "properties": { | 29 | "properties": { |
@@ -31,11 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
31 | "minValue": -10000 | 32 | "minValue": -10000 |
32 | }, | 33 | }, |
33 | "bindings": { | 34 | "bindings": { |
34 | "value": { | 35 | "value": {"<<->": "@owner.leftPosition"} |
35 | "boundObject": {"@": "owner"}, | ||
36 | "boundObjectPropertyPath": "leftPosition", | ||
37 | "oneway": false | ||
38 | } | ||
39 | } | 36 | } |
40 | }, | 37 | }, |
41 | "PosY": { | 38 | "PosY": { |
@@ -46,38 +43,31 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
46 | "minValue": -10000 |