aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom-rows
diff options
context:
space:
mode:
authorhwc4872012-05-31 17:11:08 -0700
committerhwc4872012-05-31 17:11:08 -0700
commit1c445cf5d905f79937998cf2f1115594ea8c1074 (patch)
tree35271ad7ffec86fde9102af3dd954fa3a2974582 /js/panels/properties.reel/sections/custom-rows
parent335ce503996e3ccbd2909086328d0a31fbd03370 (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts: js/io/system/ninjalibrary.json
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows')
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html10
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js3
2 files changed, 3 insertions, 10 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 + ":";