aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorhwc4872012-05-31 17:11:08 -0700
committerhwc4872012-05-31 17:11:08 -0700
commit1c445cf5d905f79937998cf2f1115594ea8c1074 (patch)
tree35271ad7ffec86fde9102af3dd954fa3a2974582 /js/data
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/data')
-rwxr-xr-xjs/data/menu-data.js47
-rw-r--r--js/data/panels-data.js12
-rwxr-xr-xjs/data/pi/pi-data.js18
-rwxr-xr-xjs/data/tools-data.js13
4 files changed, 31 insertions, 59 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 9e8bf945..aeb95ccc 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -36,11 +36,8 @@ exports.MenuData = Montage.create( Montage, {
36 "enabled": { 36 "enabled": {
37 "value": false, 37 "value": false,
38 "boundObj": "documentController", 38 "boundObj": "documentController",
39 "boundProperty": "activeDocument", 39 "boundProperty": "_documents.count()",
40 "oneway": true, 40 "oneway": true
41 "boundValueMutator": function(activeDocument){
42 return activeDocument !== null;
43 }
44 }, 41 },
45 "action": "executeFileClose" 42 "action": "executeFileClose"
46 }, 43 },
@@ -50,11 +47,8 @@ exports.MenuData = Montage.create( Montage, {
50 "enabled": { 47 "enabled": {
51 "value": false, 48 "value": false,
52 "boundObj": "documentController", 49 "boundObj": "documentController",
53 "boundProperty": "activeDocument", 50 "boundProperty": "_documents.count()",
54 "oneway": true, 51 "oneway": true
55 "boundValueMutator": function(activeDocument){
56 return activeDocument !== null;
57 }
58 }, 52 },
59 "action": "executeFileCloseAll" 53 "action": "executeFileCloseAll"
60 }, 54 },
@@ -68,11 +62,8 @@ exports.MenuData = Montage.create( Montage, {
68 "enabled": { 62 "enabled": {
69 "value": false, 63 "value": false,
70 "boundObj": "documentController", 64 "boundObj": "documentController",
71 "boundProperty": "activeDocument", 65 "boundProperty": "_documents.count()",
72 "oneway": true, 66 "oneway": true
73 "boundValueMutator": function(activeDocument){
74 return activeDocument !== null;
75 }
76 }, 67 },
77 "action": "executeSave" 68 "action": "executeSave"
78 }, 69 },
@@ -82,11 +73,8 @@ exports.MenuData = Montage.create( Montage, {
82 "enabled": { 73 "enabled": {
83 "value": false, 74 "value": false,
84 "boundObj": "documentController", 75 "boundObj": "documentController",
85 "boundProperty": "activeDocument", 76 "boundProperty": "_documents.count()",
86 "oneway": true, 77 "oneway": true
87 "boundValueMutator": function(activeDocument) {
88 return activeDocument !== null;
89 }
90 }, 78 },
91 "action":"executeSaveAs" 79 "action":"executeSaveAs"
92 }, 80 },
@@ -96,11 +84,8 @@ exports.MenuData = Montage.create( Montage, {
96 "enabled": { 84 "enabled": {
97 "value": false, 85 "value": false,
98 "boundObj": "documentController", 86 "boundObj": "documentController",
99 "boundProperty": "activeDocument", 87 "boundProperty": "_documents.count()",
100 "oneway": true, 88 "oneway": true
101 "boundValueMutator": function(activeDocument){
102 return activeDocument !== null;
103 }
104 }, 89 },
105 "action": "executeSaveAll" 90 "action": "executeSaveAll"
106 }, 91 },
@@ -130,18 +115,6 @@ exports.MenuData = Montage.create( Montage, {
130 { 115 {
131 "displayText" : "", 116 "displayText" : "",
132 "separator": true 117 "separator": true
133 },
134 {
135 "displayText" : "New Webpage",
136 "hasSubMenu" : false,
137 "enabled": true,
138 "action": "executeNewWebpage"
139 },
140 {
141 "displayText" : "Open Webpage",
142 "hasSubMenu" : false,
143 "enabled": true,
144 "action": "executeWebpageOpen"
145 } 118 }
146 ] 119 ]
147 }, 120 },
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index f613a3be..ffc76782 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -72,15 +72,15 @@ exports.PanelsData = Montage.create(Montage, {
72// }, 72// },
73 { 73 {
74 name: "CSS", 74 name: "CSS",
75 minHeight: 195, 75 height: 200,
76 height: 195, 76 minHeight: 200,
77 maxHeight: null, 77 maxHeight: null,
78 flexible: true, 78 flexible: true,
79 scrollable: true, 79 scrollable: false,
80 collapsed: true, 80 collapsed: false,
81 open: true, 81 open: true,
82 modulePath: "js/panels/CSSPanel/CSSPanelBase.reel", 82 modulePath: "js/panels/css-panel/css-panel.reel",
83 moduleName: "CSSPanelBase" 83 moduleName: "CssPanel"
84 }, 84 },
85 { 85 {
86 name: "Presets", 86 name: "Presets",
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index d1dc9f34..157cbc64 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -14,25 +14,11 @@ exports.PiData = Montage.create( Montage, {
14 { 14 {
15 label: "Style", 15 label: "Style",
16 16
17 Section: [
18 [
19
20 ]
21 ]
22 }
23 ]
24 },
25
26 stagePi: {
27 value: [
28 {
29 label: "Style",
30
31 Section: [ 17 Section: [
32 [ 18 [
33 { 19 {
34 type : "chip", 20 type: "chip",
35 id : "background", 21 id: "background",
36 prop: "background" 22 prop: "background"
37 } 23 }
38 ] 24 ]
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 32eaf24d..05455efe 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -60,6 +60,7 @@ exports.ToolsData = Montage.create(Montage, {
60 "cursor": "auto", 60 "cursor": "auto",
61 "lastInGroup": false, 61 "lastInGroup": false,
62 "container": false, 62 "container": false,
63 "subtools": [],
63 "selected": true 64 "selected": true
64 }, 65 },
65 { 66 {
@@ -71,6 +72,7 @@ exports.ToolsData = Montage.create(Montage, {
71 "cursor": "auto", 72 "cursor": "auto",
72 "lastInGroup": false, 73 "lastInGroup": false,
73 "container": false, 74 "container": false,
75 "subtools": [],
74 "selected": false 76 "selected": false
75 }, 77 },
76 { 78 {
@@ -82,6 +84,7 @@ exports.ToolsData = Montage.create(Montage, {
82 "cursor": "auto", 84 "cursor": "auto",
83 "lastInGroup": true, 85 "lastInGroup": true,
84 "container": false, 86 "container": false,
87 "subtools": [],
85 "selected": false 88 "selected": false
86 }, 89 },
87 { 90 {
@@ -93,6 +96,7 @@ exports.ToolsData = Montage.create(Montage, {
93 "cursor": "url('images/cursors/Crosshair.png') 8 8, default", 96 "cursor": "url('images/cursors/Crosshair.png') 8 8, default",
94 "lastInGroup": false, 97 "lastInGroup": false,
95 "container": false, 98 "container": false,
99 "subtools": [],
96 "selected": false 100 "selected": false
97 }, 101 },
98 { 102 {
@@ -104,6 +108,7 @@ exports.ToolsData = Montage.create(Montage, {
104 "cursor": "auto", 108 "cursor": "auto",
105 "lastInGroup": false, 109 "lastInGroup": false,
106 "container": false, 110 "container": false,
111 "subtools": [],
107 "selected": false 112 "selected": false
108 }, 113 },
109 { 114 {
@@ -115,6 +120,7 @@ exports.ToolsData = Montage.create(Montage, {
115 "cursor": "text", 120 "cursor": "text",
116 "lastInGroup": false, 121 "lastInGroup": false,
117 "container": false, 122 "container": false,
123 "subtools": [],
118 "selected": false 124 "selected": false
119 }, 125 },
120 { 126 {
@@ -163,6 +169,7 @@ exports.ToolsData = Montage.create(Montage, {
163 "cursor": "url('images/tools/brush_down.png') 9 17, default", 169 "cursor": "url('images/tools/brush_down.png') 9 17, default",
164 "lastInGroup": false, 170 "lastInGroup": false,
165 "container": false, 171 "container": false,
172 "subtools": [],
166