Merge branch 'refs/heads/Ninja-Internal' into Document

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, {
                             "enabled": {
                                 "value": false,
                                 "boundObj": "documentController",
-                                "boundProperty": "canSave",
-                                "oneway": true
+                                "boundProperty": "activeDocument",
+                                "oneway": true,
+                                "boundValueMutator": function(activeDocument){
+                                    if(activeDocument !== null){return true;}
+                                    else{return false;}
+                                }
                             },
                             "action": "executeSave"
                         },
@@ -96,10 +100,10 @@ exports.MenuData = Montage.create( Montage, {
                             "enabled": {
                                 "value": false,
                                 "boundObj": "documentController",
-                                "boundProperty": "canSaveAll",
+                                "boundProperty": "activeDocument",
                                 "oneway": true,
-                                "boundValueMutator": function(canSaveAll){
-                                    if(canSaveAll === true){return true;}
+                                "boundValueMutator": function(activeDocument){
+                                    if(activeDocument !== null){return true;}
                                     else{return false;}
                                 }
                             },
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, {
             scrollable: true,
             collapsed: true,
             open: true,
-            modulePath: "js/panels/Components/ComponentsPanelBase.reel",
-            moduleName: "ComponentsPanelBase"
+            modulePath: "js/panels/components-panel.reel",
+            moduleName: "ComponentsPanel"
         },
 //        {
 //            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, {
                             valueMutator: parseFloat,
                             value : 0,
                             min :   0,
-                            max :   100,
+                            max :   99,
                             unit : "%",
                             acceptableUnits: ["%"]