diff options
| author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
| commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
| tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/panels/properties.reel/sections | |
| parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
| parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
| download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections')
3 files changed, 4 insertions, 11 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 49b4414e..b1fd910d 100755 --- a/js/panels/properties.reel/sections/custom.reel/custom.js +++ b/js/panels/properties.reel/sections/custom.reel/custom.js | |||
| @@ -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 | } |