Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture

Conflicts:
	js/document/templates/montage-web/default_html.css

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 2 insertions, 14 deletions

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"
                         }
                     ]
                 },