aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-10 11:24:35 -0700
committerJose Antonio Marquez2012-04-10 11:24:35 -0700
commite663e336ee7e832b5059a82748061506b414cb04 (patch)
treea09d932319365067f437780e90aeab4ef19f74b4 /js/data
parentc3022de5ba2e24737184dba7454233b165da0a20 (diff)
parentbd43ce383b050d03b0f92cc923c517febc66ca28 (diff)
downloadninja-e663e336ee7e832b5059a82748061506b414cb04.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js14
-rw-r--r--js/data/panels-data.js4
-rwxr-xr-xjs/data/pi/pi-data.js2
3 files changed, 12 insertions, 8 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 3333d209..a1fe2703 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -70,8 +70,12 @@ exports.MenuData = Montage.create( Montage, {
70 "enabled": { 70 "enabled": {
71 "value": false, 71 "value": false,
72 "boundObj": "documentController", 72 "boundObj": "documentController",
73 "boundProperty": "canSave", 73 "boundProperty": "activeDocument",
74 "oneway": true 74 "oneway": true,
75 "boundValueMutator": function(activeDocument){
76 if(activeDocument !== null){return true;}
77 else{return false;}
78 }
75 }, 79 },
76 "action": "executeSave" 80 "action": "executeSave"
77 }, 81 },
@@ -96,10 +100,10 @@ exports.MenuData = Montage.create( Montage, {
96 "enabled": { 100 "enabled": {
97 "value": false, 101 "value": false,
98 "boundObj": "documentController", 102 "boundObj": "documentController",
99 "boundProperty": "canSaveAll", 103 "boundProperty": "activeDocument",
100 "oneway": true, 104 "oneway": true,
101 "boundValueMutator": function(canSaveAll){ 105 "boundValueMutator": function(activeDocument){
102 if(canSaveAll === true){return true;} 106 if(activeDocument !== null){return true;}
103 else{return false;} 107 else{return false;}
104 } 108 }
105 }, 109 },
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 2422f5e7..7a2d817a 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -55,8 +55,8 @@ exports.PanelsData = Montage.create(Montage, {
55 scrollable: true, 55 scrollable: true,
56 collapsed: true, 56 collapsed: true,
57 open: true, 57 open: true,
58 modulePath: "js/panels/Components/ComponentsPanelBase.reel", 58 modulePath: "js/panels/components-panel.reel",
59 moduleName: "ComponentsPanelBase" 59 moduleName: "ComponentsPanel"
60 }, 60 },
61// { 61// {
62// name: "Project/Assets", 62// name: "Project/Assets",
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 7edc90d8..07017f09 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -578,7 +578,7 @@ exports.PiData = Montage.create( Montage, {
578 valueMutator: parseFloat, 578 valueMutator: parseFloat,
579 value : 0, 579 value : 0,
580 min : 0, 580 min : 0,
581 max : 100, 581 max : 99,
582 unit : "%", 582 unit : "%",
583 acceptableUnits: ["%"] 583 acceptableUnits: ["%"]
584 584