Revert "Bug 921828 - (app-menu) [Window Management] Refactor ListMenu…

… and move it to AppWindow + implement System Wide Menu if needed"

This reverts commit daa85b7.

Reverted due to linter errors.

apps/system/index.html

@@ -121,6 +121,9 @@
     <link rel="stylesheet" type="text/css" href="style/action_menu/action_menu_extended.css">
     <script defer src="js/action_menu.js"></script>
 
+    <!-- Context Menu -->
+    <script defer src="js/context_menu.js"></script>
+
     <!-- Statusbar -->
     <link rel="stylesheet" type="text/css" href="style/statusbar/statusbar.css">
     <script defer src="js/statusbar.js"></script>
@@ -289,7 +292,6 @@
     <!-- homescreen from being displayed must come before this script. -->
     <link rel="stylesheet" type="text/css" href="style/window.css">
     <script defer src="js/base_ui.js"></script>
-    <script defer src="js/browser_context_menu.js"></script>
     <script defer src="js/app_modal_dialog.js"></script>
     <script defer src="js/app_chrome.js"></script>
     <script defer src="js/app_transition_controller.js"></script>

apps/system/js/activity_window.js

@@ -180,8 +180,7 @@
   ActivityWindow.SUB_COMPONENTS = {
     'transitionController': window.AppTransitionController,
     'modalDialog': window.AppModalDialog,
-    'authDialog': window.AppAuthenticationDialog,
-    'contextmenu': window.BrowserContextMenu
+    'authDialog': window.AppAuthenticationDialog
   };
 
   ActivityWindow.REGISTERED_EVENTS =

apps/system/js/app_window.js

@@ -456,8 +456,7 @@
   AppWindow.SUB_COMPONENTS = {
     'transitionController': window.AppTransitionController,
     'modalDialog': window.AppModalDialog,
-    'authDialog': window.AppAuthenticationDialog,
-    'contextmenu': window.BrowserContextMenu
+    'authDialog': window.AppAuthenticationDialog
   };
 
   AppWindow.prototype.openAnimation = 'enlarge';

apps/system/js/context_menu.js

@@ -0,0 +1,25 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+var ContextMenu = {
+  init: function cm_init() {
+    window.addEventListener('mozbrowsercontextmenu', this, true);
+  },
+
+  handleEvent: function cm_handleEvent(evt) {
+    var detail = evt.detail;
+    if (!detail.contextmenu || detail.contextmenu.items.length == 0)
+      return;
+
+    var onsuccess = function(action) {
+      detail.contextMenuItemSelected(action);
+    };
+
+    ActionMenu.open(detail.contextmenu.items, '', onsuccess);
+    evt.preventDefault();
+  }
+};
+
+ContextMenu.init();

apps/system/style/window.css

@@ -244,10 +244,6 @@
   visibility: visible;
 }
 
-.appWindow > .contextmenu {
-  z-index: 2;
-}
-
 .appWindow > .modal-dialog {
   z-index: 3;
 }
@@ -286,12 +282,7 @@
   display: none;
 }
 
-.appWindow > .contextmenu {
-  display: none;
-}
-
 .appWindow > .modal-dialog.visible,
-.appWindow > .contextmenu.visible,
 .appWindow > .authentication-dialog.visible,
 .authentication-dialog > .authentication-dialog-http.visible {
   display: block;
@@ -322,11 +313,6 @@
   display: block;
 }
 
-.appWindow > form[role="dialog"][data-type="action"],
-.appWindow > form[role="dialog"][data-type="object"] {
-  top: 2rem;
-}
-
 .appWindow > .screenshot-overlay {
   z-index: -1;
   visibility: hidden;