delayed load for the menu of some buttons

apps/common/main/lib/component/Button.js

@@ -218,7 +218,7 @@ define([
                         style        : me.style
                     }));
 
-                    if (me.menu && _.isFunction(me.menu.render))
+                    if (me.menu && _.isObject(me.menu) && _.isFunction(me.menu.render))
                         me.menu.render(me.cmpEl);
 
                     parentEl.html(me.cmpEl);
@@ -491,6 +491,13 @@ define([
                 }
             }
         }
+
+        , setMenu: function (m) {
+            if (m && _.isObject(m) && _.isFunction(m.render)){
+                this.menu = m;
+                this.menu.render(this.cmpEl);
+            }
+        }
     });
 });
 

apps/documenteditor/main/app/controller/Main.js

@@ -850,7 +850,7 @@ define([
                         if (window.styles_loaded) {
                             clearInterval(timer_sl);
 
-                            toolbarController.getView('Toolbar').createDelayedElements();
+                            toolbarController.createDelayedElements();
 
                             documentHolderController.getView('DocumentHolder').createDelayedElements();
                             me.loadLanguages();

apps/documenteditor/main/app/controller/Toolbar.js

@@ -166,7 +166,7 @@ define([
             // Create toolbar view
             this.toolbar = this.createView('Toolbar');
 
-            this.toolbar.on('render:after', _.bind(this.onToolbarAfterRender, this));
+            // this.toolbar.on('render:after', _.bind(this.onToolbarAfterRender, this));
         },
 
         onToolbarAfterRender: function(toolbar) {
@@ -2627,6 +2627,11 @@ define([
             me._mailMergeDlg.show();
         },
 
+        createDelayedElements: function() {
+            this.toolbar.createDelayedElements();
+            this.onToolbarAfterRender(this.toolbar);
+        },
+
         textEmptyImgUrl                            : 'You need to specify image URL.',
         textWarning                                : 'Warning',
         textFontSizeErr                            : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 100',