From df3f96beb749951162bb60ec88363340e3ef6d95 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 1 May 2012 15:59:47 -0700 Subject: More clean up, updating menu items --- js/data/menu-data.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'js/data/menu-data.js') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 9e8bf945..1cde3e8d 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -22,13 +22,13 @@ exports.MenuData = Montage.create( Montage, { "displayText" : "New File", "hasSubMenu" : false, "enabled": true, - "action": "executeNewFile" + "action": "executeNewWebpage" }, { "displayText" : "Open File", "hasSubMenu" : false, "enabled": true, - "action": "executeFileOpen" + "action": "executeWebpageOpen" }, { "displayText" : "Close File", @@ -130,18 +130,6 @@ exports.MenuData = Montage.create( Montage, { { "displayText" : "", "separator": true - }, - { - "displayText" : "New Webpage", - "hasSubMenu" : false, - "enabled": true, - "action": "executeNewWebpage" - }, - { - "displayText" : "Open Webpage", - "hasSubMenu" : false, - "enabled": true, - "action": "executeWebpageOpen" } ] }, -- cgit v1.2.3 From 0ebb822b0535bf1bb100b3f3cb396c8b6d3383f1 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 11:23:12 -0700 Subject: fixing some of the document bindings. Signed-off-by: Valerio Virgillito --- js/data/menu-data.js | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'js/data/menu-data.js') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 1cde3e8d..7cf40a8a 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -36,11 +36,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action": "executeFileClose" }, @@ -50,11 +47,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action": "executeFileCloseAll" }, @@ -68,11 +62,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action": "executeSave" }, @@ -82,11 +73,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument) { - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action":"executeSaveAs" }, @@ -96,11 +84,8 @@ exports.MenuData = Montage.create( Montage, { "enabled": { "value": false, "boundObj": "documentController", - "boundProperty": "activeDocument", - "oneway": true, - "boundValueMutator": function(activeDocument){ - return activeDocument !== null; - } + "boundProperty": "_documents.count()", + "oneway": true }, "action": "executeSaveAll" }, -- cgit v1.2.3 From c26de5fa7b909a53b103b72027b5cbe7c3e1c49f Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 16 May 2012 22:48:39 -0700 Subject: code cleanup and refactoring of the document controller and stage view Signed-off-by: Valerio Virgillito --- js/data/menu-data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/data/menu-data.js') diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 7cf40a8a..aeb95ccc 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js @@ -22,13 +22,13 @@ exports.MenuData = Montage.create( Montage, { "displayText" : "New File", "hasSubMenu" : false, "enabled": true, - "action": "executeNewWebpage" + "action": "executeNewFile" }, { "displayText" : "Open File", "hasSubMenu" : false, "enabled": true, - "action": "executeWebpageOpen" + "action": "executeFileOpen" }, { "displayText" : "Close File", -- cgit v1.2.3