aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.html26
-rwxr-xr-xjs/panels/properties.reel/properties.js1
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html9
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html9
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html9
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html9
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.html15
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html36
9 files changed, 41 insertions, 79 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index d212ae80..554d1477 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"},
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index b21014c1..ee90cd64 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -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) {
diff --git a/js/panels/properties.reel/section.reel/section.html b/js/panels/properties.reel/section.reel/section.html
index b72a91b3..e6f68751 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": "Slot",
23 "properties": { 21 "properties": {
24 "element": {"#": "sectionSlot"} 22 "element": {"#": "sectionSlot"}
25 } 23 }
26 }, 24 },
27 25
28 "sectionSplitter": { 26 "sectionSplitter": {
29 "module": "js/panels/Splitter", 27 "prototype": "js/panels/Splitter",
30 "name": "Splitter",
31 "properties": { 28 "properties": {
32 "element": {"#": "sectionSplitter"}, 29 "element": {"#": "sectionSplitter"},
33 "panel": {"@": "sectionSlot"} 30 "panel": {"@": "sectionSlot"}
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
index 58a50a0d..990dc739 100755
--- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
+++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.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/sections/custom-rows/color-select.reel", 12 "prototype" : "js/panels/properties.reel/sections/custom-rows/color-select.reel",
13 "name" : "ColorSelect",
14 "properties" : { 13 "properties" : {
15 "element" : {"#": "section"}, 14 "element" : {"#": "section"},
16 "Stroke" : {"#": "Stroke"}, 15 "Stroke" : {"#": "Stroke"},
@@ -22,16 +21,14 @@
22 21
23 22
24 "colorChip": { 23 "colorChip": {
25 "module" : "js/components/ui/color-chip.reel", 24 "prototype" : "js/components/ui/color-chip.reel",
26 "name" : "ColorChip",
27 "properties" : { 25 "properties" : {
28 "element" : {"#": "Stroke"} 26 "element" : {"#": "Stroke"}
29 } 27 }
30 }, 28 },
31 29
32 "colorChip2": { 30 "colorChip2": {
33 "module" : "js/components/ui/color-chip.reel", 31 "prototype" : "js/components/ui/color-chip.reel",
34 "name" : "ColorChip",
35 "properties" : { 32 "properties" : {
36 "element" : {"#": "Fill"}, 33 "element" : {"#": "Fill"},
37 "mode": "fill" 34 "mode": "fill"
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 be4ae431..d1b5f28b 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
@@ -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/sections/custom-rows/dual-row.reel", 12 "prototype" : "js/panels/properties.reel/sections/custom-rows/dual-row.reel",
13 "name" : "DualRow",
14 "properties" : { 13 "properties" : {
15 "element" : {"#": "section"}, 14 "element" : {"#": "section"},
16 "slot" : {"@": "slot"}, 15 "slot" : {"@": "slot"},
@@ -18,8 +17,7 @@
18 } 17 }