aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/properties.reel
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.html9
-rwxr-xr-xjs/panels/properties.reel/properties.js19
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.js1
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js4
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html17
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.js41
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js55
8 files changed, 128 insertions, 20 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index b9aa206b..a737bd39 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -13,24 +13,21 @@
13 "elementName": { 13 "elementName": {
14 "prototype": "montage/ui/textfield.reel", 14 "prototype": "montage/ui/textfield.reel",
15 "properties": { 15 "properties": {
16 "element": {"#": "elementName"}, 16 "element": {"#": "elementName"}
17 "readOnly": true
18 } 17 }
19 }, 18 },
20 19
21 "elementId": { 20 "elementId": {
22 "prototype": "montage/ui/textfield.reel", 21 "prototype": "montage/ui/textfield.reel",
23 "properties": { 22 "properties": {
24 "element": {"#": "elementId"}, 23 "element": {"#": "elementId"}
25 "readOnly": false
26 } 24 }
27 }, 25 },
28 26
29 "elementClass": { 27 "elementClass": {
30 "prototype": "montage/ui/textfield.reel", 28 "prototype": "montage/ui/textfield.reel",
31 "properties": { 29 "properties": {
32 "element": {"#": "elementClass"}, 30 "element": {"#": "elementClass"}
33 "readOnly": false
34 } 31 }
35 }, 32 },
36 33
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 97dc017d..43c92b74 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -43,15 +43,28 @@ exports.Properties = Montage.create(Component, {
43 }, 43 },
44 44
45 elementName: { 45 elementName: {
46 value: null 46 value: null,
47 serializable: true
47 }, 48 },
48 49
49 elementId: { 50 elementId: {
50 value: null 51 value: null,
52 serializable: true
51 }, 53 },
52 54
53 elementClass: { 55 elementClass: {
54 value: null 56 value: null,
57 serializable: true
58 },
59
60 positionSize: {
61 value: null,
62 serializable: true
63 },
64
65 threeD: {
66 value: null,
67 serializable: true
55 }, 68 },
56 69
57 customSections: { 70 customSections: {
diff --git a/js/panels/properties.reel/section.reel/section.js b/js/panels/properties.reel/section.reel/section.js
index b246c171..310bc48f 100755
--- a/js/panels/properties.reel/section.reel/section.js
+++ b/js/panels/properties.reel/section.reel/section.js
@@ -11,6 +11,7 @@ exports.Section = Montage.create(Component, {
11 11
12 name: { 12 name: {
13 value: "Panel" 13 value: "Panel"
14
14 }, 15 },
15 16
16 slot: { 17 slot: {
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js
index b606d6b8..a11cd3f6 100755
--- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js
+++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js
@@ -8,6 +8,10 @@ var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9 9
10exports.SingleRow = Montage.create(Component, { 10exports.SingleRow = Montage.create(Component, {
11 slot: {
12 value: null
13 },
14
11 id: { 15 id: {
12 value: null 16 value: null
13 }, 17 },
diff --git a/js/panels/properties.reel/sections/position-size.reel/position-size.html b/js/panels/properties.reel/sections/position-size.reel/position-size.html
index bc93da33..d322f826 100755
--- a/js/panels/properties.reel/sections/position-size.reel/position-size.html
+++ b/js/panels/properties.reel/sections/position-size.reel/position-size.html
@@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 "units": "px" 34 "units": "px"
35 }, 35 },
36 "bindings": { 36 "bindings": {
37 "units": {"<<->": "@owner.leftUnits"}, 37 "units": {"<->": "@owner.leftUnits"},
38 "value": {"<<->": "@owner.leftPosition"} 38 "value": {"<->": "@owner.leftPosition"}
39 } 39 }
40 }, 40 },
41 "PosY": { 41 "PosY": {
@@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
48 "units": "px" 48 "units": "px"
49 }, 49 },
50 "bindings": { 50 "bindings": {
51 "units": {"<<->": "@owner.topUnits"}, 51 "units": {"<->": "@owner.topUnits"},
52 "value": {"<<->": "@owner.topPosition"} 52 "value": {"<->": "@owner.topPosition"}
53 } 53 }
54 }, 54 },
55 55
@@ -61,8 +61,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
61 "units": "px" 61 "units": "px"
62 }, 62 },
63 "bindings": { 63 "bindings": {
64 "units": {"<<->": "@owner.heightUnits"}, 64 "units": {"<->": "@owner.heightUnits"},
65 "value": {"<<->": "@owner.heightSize"} 65 "value": {"<->": "@owner.heightSize"}
66 } 66 }
67 }, 67 },
68 68
@@ -74,8 +74,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
74 "units": "px" 74 "units": "px"
75 }, 75 },
76 "bindings": { 76 "bindings": {
77 "units": {"<<->": "@owner.widthUnits"}, 77 "units": {"<->": "@owner.widthUnits"},
78 "value": {"<<->": "@owner.widthSize"} 78 "value": {"<->": "@owner.widthSize"}
79 } 79 }
80 80
81 }, 81 },
@@ -84,7 +84,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
84 "properties": { 84 "properties": {
85 "element": {"#": "posBound"}, 85 "element": {"#": "posBound"},
86 "pressedClass": "lockUp", 86 "pressedClass": "lockUp",
87 "preventFocus": true,
88 "identifier": "ratio" 87 "identifier": "ratio"
89 } 88 }
90 } 89 }
diff --git a/js/panels/properties.reel/sections/position-size.reel/position-size.js b/js/panels/properties.reel/sections/position-size.reel/position-size.js
index d9fd629c..94c0bbf2 100755
--- a/js/panels/properties.reel/sections/position-size.reel/position-size.js
+++ b/js/panels/properties.reel/sections/position-size.reel/position-size.js
@@ -8,6 +8,47 @@ var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9 9
10exports.PositionSize = Montage.create(Component, { 10exports.PositionSize = Montage.create(Component, {
11
12 position: {
13 value: null,
14 serializable: true
15 },
16
17 leftLabel: {
18 value: null,
19 serializable: true
20 },
21
22 leftControl: {
23 value: null,
24 serializable: true
25 },
26
27 topLabel: {
28 value: null,
29 serializable: true
30 },
31
32 topControl: {