Only render/remove submenus when menu is rendered or rendering

Added the 'or rendering' part. Otherwise rendering of the submenus will
fail when called through a render method (of the menu itself) method
instead of a menu action.

Menu: remove unnecessary fix for a problem that was caused by not
rendering the submenus correctly.

Change-Id: I98e12c0d286478eab774672873f8fa4b1e98d627
Signed-off-by: Ralf Muri <ralf.muri@bsi-software.com>
Reviewed-on: https://git.eclipse.org/r/160191
Tested-by: CI Bot
Reviewed-by: Roger Stebler <roger.stebler@bsi-software.com>

org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/ContextMenuPopup.js

@@ -65,7 +65,7 @@ scout.ContextMenuPopup.prototype._installScrollbars = function() {
 };
 
 scout.ContextMenuPopup.prototype.removeSubMenuItems = function(parentMenu, animated) {
-  if (!this.rendered) {
+  if (!this.rendered && !this.rendering) {
     return;
   }
   if (this.bodyAnimating) {
@@ -160,7 +160,7 @@ scout.ContextMenuPopup.prototype.renderSubMenuItems = function(parentMenu, menus
     };
     return;
   }
-  if (!this.rendered) {
+  if (!this.rendered && !this.rendering) {
     return;
   }
   if (this.bodyAnimating) {

org.eclipse.scout.rt.ui.html/src/main/js/scout/menu/Menu.js

@@ -134,22 +134,17 @@ scout.Menu.prototype._removeSubMenuItems = function(parentMenu) {
 scout.Menu.prototype._renderSubMenuItems = function(parentMenu, menus) {
   if (this.parent instanceof scout.ContextMenuPopup) {
     this.parent.renderSubMenuItems(parentMenu, menus, true);
-    // only attach close handler when menus are really rendered. This is usually not the case on startup or reload.
-    if (menus.filter(function(m) {
-        return m.rendered;
-      }).length > 0) {
-      var closeHandler = function(event) {
-        parentMenu.setSelected(false);
-      }.bind(this);
-      var propertyChangeHandler = function(event) {
-        if (event.propertyName === 'selected' && event.newValue === false) {
-          this.parent.off('close', closeHandler);
-          parentMenu.off('propertyChange', propertyChangeHandler);
-        }
-      }.bind(this);
-      this.parent.on('close', closeHandler);
-      parentMenu.on('propertyChange', propertyChangeHandler);
-    }
+    var closeHandler = function(event) {
+      parentMenu.setSelected(false);
+    }.bind(this);
+    var propertyChangeHandler = function(event) {
+      if (event.propertyName === 'selected' && event.newValue === false) {
+        this.parent.off('close', closeHandler);
+        parentMenu.off('propertyChange', propertyChangeHandler);
+      }
+    }.bind(this);
+    this.parent.on('close', closeHandler);
+    parentMenu.on('propertyChange', propertyChangeHandler);
   } else if (this.parent instanceof scout.Menu) {
     this.parent._renderSubMenuItems(parentMenu, menus);
   }