aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-15 20:37:48 -0800
committerJose Antonio Marquez2012-02-15 20:37:48 -0800
commit89b5e793ea88ef235b54b6e1d1c379698d3e612b (patch)
tree4d29118f35df77ca6b423119a4ff61694a442cbf /js/data
parent9d2c2a80483415d7560b00cda5519153db23e241 (diff)
parentd366c0bd1af6471511217ed574083e15059519b5 (diff)
downloadninja-89b5e793ea88ef235b54b6e1d1c379698d3e612b.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/data')
-rwxr-xr-x[-rw-r--r--]js/data/appdata.js0
-rwxr-xr-x[-rw-r--r--]js/data/menu-data.js17
-rwxr-xr-x[-rw-r--r--]js/data/pi/pi-data.js16
-rwxr-xr-x[-rw-r--r--]js/data/settings.js0
-rwxr-xr-x[-rw-r--r--]js/data/tools-data.js0
5 files changed, 25 insertions, 8 deletions
diff --git a/js/data/appdata.js b/js/data/appdata.js
index 0a6c4976..0a6c4976 100644..100755
--- a/js/data/appdata.js
+++ b/js/data/appdata.js
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 34adc82d..3a065958 100644..100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -15,7 +15,7 @@ exports.MenuData = Montage.create( Montage, {
15 { 15 {
16 "displayText" : "New Project", 16 "displayText" : "New Project",
17 "hasSubMenu" : false, 17 "hasSubMenu" : false,
18 "enabled": true, 18 "enabled": false,
19 "action": "executeNewProject" 19 "action": "executeNewProject"
20 }, 20 },
21 { 21 {
@@ -25,7 +25,7 @@ exports.MenuData = Montage.create( Montage, {
25 "action": "executeNewFile" 25 "action": "executeNewFile"
26 }, 26 },
27 { 27 {
28 "displayText" : "Open...", 28 "displayText" : "Open File",
29 "hasSubMenu" : false, 29 "hasSubMenu" : false,
30 "enabled": true, 30 "enabled": true,
31 "action": "executeFileOpen" 31 "action": "executeFileOpen"
@@ -37,17 +37,20 @@ exports.MenuData = Montage.create( Montage, {
37 { 37 {
38 "displayText" : "Save", 38 "displayText" : "Save",
39 "hasSubMenu" : false, 39 "hasSubMenu" : false,
40 "enabled": false 40 "enabled": true,
41 "action": "executeSave"
41 }, 42 },
42 { 43 {
43 "displayText" : "Save As", 44 "displayText" : "Save As",
44 "hasSubMenu" : false, 45 "hasSubMenu" : false,
45 "enabled": false 46 "enabled": true,
47 "action":"saveAs"
46 }, 48 },
47 { 49 {
48 "displayText" : "Save All", 50 "displayText" : "Save All",
49 "hasSubMenu" : false, 51 "hasSubMenu" : false,
50 "enabled": false 52 "enabled": true,
53 "action": "executeSaveAll"
51 }, 54 },
52 { 55 {
53 "displayText" : "", 56 "displayText" : "",
@@ -56,12 +59,12 @@ exports.MenuData = Montage.create( Montage, {
56 { 59 {
57 "displayText" : "Open Project", 60 "displayText" : "Open Project",
58 "hasSubMenu" : false, 61 "hasSubMenu" : false,
59 "enabled": true 62 "enabled": false
60 }, 63 },
61 { 64 {
62 "displayText" : "Open Recent", 65 "displayText" : "Open Recent",
63 "hasSubMenu" : false, 66 "hasSubMenu" : false,
64 "enabled": true 67 "enabled": false
65 }, 68 },
66 { 69 {
67 "displayText" : "Close Project", 70 "displayText" : "Close Project",
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index eba55535..c42d9082 100644..100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -10,7 +10,21 @@ var Montage = require("montage/core/core").Montage,
10exports.PiData = Montage.create( Montage, { 10exports.PiData = Montage.create( Montage, {
11 11
12 stagePi: { 12 stagePi: {
13 value: [] 13 value: [
14 {
15 label: "Style",
16
17 Section: [
18 [
19 {
20 type : "chip",
21 id : "background",
22 prop: "background"
23 }
24 ]
25 ]
26 }
27 ]
14 }, 28 },
15 29
16 blockPi: { 30 blockPi: {
diff --git a/js/data/settings.js b/js/data/settings.js
index ffea2075..ffea2075 100644..100755
--- a/js/data/settings.js
+++ b/js/data/settings.js
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index de965dbc..de965dbc 100644..100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js