sync

diff --git a/roojs-all.js b/roojs-all.js
index fa80123..fc65553 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -608,7 +608,7 @@ this.fireEvent("mouseover",this,e,t);},onMouseOut:function(e){var t;if(t=this.fi
 this.fireEvent("mouseout",this,e,t);},isVisible:function(){return this.el&&!this.hidden;},show:function(el,H,I){this.parentMenu=I;if(!this.el){this.render();}
 this.fireEvent("beforeshow",this);this.showAt(this.el.getAlignToXY(el,H||this.defaultAlign),I,false);},showAt:function(xy,J,_e){this.parentMenu=J;if(!this.el){this.render();}if(_e!==false){this.fireEvent("beforeshow",this);xy=this.el.adjustForConstraints(xy);}
 this.el.setXY(xy);this.el.show();this.hidden=false;this.focus();this.fireEvent("show",this);},focus:function(){if(!this.hidden){this.doFocus.defer(50,this);}},doFocus:function(){if(!this.hidden){this.focusEl.focus();}},hide:function(K){if(this.el&&this.isVisible()){this.fireEvent("beforehide",this);if(this.activeItem){this.activeItem.deactivate();this.activeItem=null;}
-this.el.hide();this.hidden=true;this.fireEvent("hide",this);}if(K===true&&this.parentMenu){this.parentMenu.hide(true);}},add:function(){var a=arguments,l=a.length,L;for(var i=0;i<l;i++){var el=a[i];if(el.render){L=this.addItem(el);}else if(typeof el=="string"){if(el=="separator"||el=="-"){L=this.addSeparator();}else {L=this.addText(el);}}else if(el.tagName||el.el){L=this.addElement(el);}else if(typeof el=="object"){L=this.addMenuItem(el);}}return L;},getEl:function(){if(!this.el){this.render();}return this.el;},addSeparator:function(){return this.addItem(new Roo.menu.Separator());},addElement:function(el){return this.addItem(new Roo.menu.BaseItem(el));},addItem:function(M){this.items.add(M);if(this.ul){var li=document.createElement("li");li.className="x-menu-list-item";this.ul.dom.appendChild(li);M.render(li,this);this.delayAutoWidth();}return M;},addMenuItem:function(N){if(!(N instanceof Roo.menu.Item)){if(typeof N.checked=="boolean"){N=new Roo.menu.CheckItem(N);}else {N=new Roo.menu.Item(N);}}return this.addItem(N);},addText:function(O){return this.addItem(new Roo.menu.TextItem(O));},insert:function(P,Q){this.items.insert(P,Q);if(this.ul){var li=document.createElement("li");li.className="x-menu-list-item";this.ul.dom.insertBefore(li,this.ul.dom.childNodes[P]);Q.render(li,this);this.delayAutoWidth();}return Q;},remove:function(R){this.items.removeKey(R.id);R.destroy();},removeAll:function(){var f;while(f=this.items.first()){this.remove(f);}}});Roo.menu.MenuNav=function(S){Roo.menu.MenuNav.superclass.constructor.call(this,S.el);this.scope=this.menu=S;};Roo.extend(Roo.menu.MenuNav,Roo.KeyNav,{doRelay:function(e,h){var k=e.getKey();if(!this.menu.activeItem&&e.isNavKeyPress()&&k!=e.SPACE&&k!=e.RETURN ){this.menu.tryActivate(0,1);return false;}return h.call(this.scope||this,e,this.menu);},up:function(e,m){if(!m.tryActivate(m.items.indexOf(m.activeItem)-1,-1)){m.tryActivate(m.items.length-1,-1);}},down:function(e,m){if(!m.tryActivate(m.items.indexOf(m.activeItem)+1,1)){m.tryActivate(0,1);}},right:function(e,m){if(m.activeItem){m.activeItem.expandMenu(true);}},left:function(e,m){m.hide();if(m.parentMenu&&m.parentMenu.activeItem){m.parentMenu.activeItem.activate();}},enter:function(e,m){if(m.activeItem){e.stopPropagation();m.activeItem.onClick(e);m.fireEvent("click",this,m.activeItem);return true;}}});
+this.el.hide();this.hidden=true;this.fireEvent("hide",this);}if(K===true&&this.parentMenu){this.parentMenu.hide(true);}},add:function(){var a=arguments,l=a.length,L;for(var i=0;i<l;i++){var el=a[i];if(typeof el=="object"&&el.xtype){el=Roo.factory(el,Roo.menu);}if(el.render){L=this.addItem(el);}else if(typeof el=="string"){if(el=="separator"||el=="-"){L=this.addSeparator();}else {L=this.addText(el);}}else if(el.tagName||el.el){L=this.addElement(el);}else if(typeof el=="object"){L=this.addMenuItem(el);}}return L;},getEl:function(){if(!this.el){this.render();}return this.el;},addSeparator:function(){return this.addItem(new Roo.menu.Separator());},addElement:function(el){return this.addItem(new Roo.menu.BaseItem(el));},addItem:function(M){this.items.add(M);if(this.ul){var li=document.createElement("li");li.className="x-menu-list-item";this.ul.dom.appendChild(li);M.render(li,this);this.delayAutoWidth();}return M;},addMenuItem:function(N){if(!(N instanceof Roo.menu.Item)){if(typeof N.checked=="boolean"){N=new Roo.menu.CheckItem(N);}else {N=new Roo.menu.Item(N);}}return this.addItem(N);},addText:function(O){return this.addItem(new Roo.menu.TextItem(O));},insert:function(P,Q){this.items.insert(P,Q);if(this.ul){var li=document.createElement("li");li.className="x-menu-list-item";this.ul.dom.insertBefore(li,this.ul.dom.childNodes[P]);Q.render(li,this);this.delayAutoWidth();}return Q;},remove:function(R){this.items.removeKey(R.id);R.destroy();},removeAll:function(){var f;while(f=this.items.first()){this.remove(f);}}});Roo.menu.MenuNav=function(S){Roo.menu.MenuNav.superclass.constructor.call(this,S.el);this.scope=this.menu=S;};Roo.extend(Roo.menu.MenuNav,Roo.KeyNav,{doRelay:function(e,h){var k=e.getKey();if(!this.menu.activeItem&&e.isNavKeyPress()&&k!=e.SPACE&&k!=e.RETURN ){this.menu.tryActivate(0,1);return false;}return h.call(this.scope||this,e,this.menu);},up:function(e,m){if(!m.tryActivate(m.items.indexOf(m.activeItem)-1,-1)){m.tryActivate(m.items.length-1,-1);}},down:function(e,m){if(!m.tryActivate(m.items.indexOf(m.activeItem)+1,1)){m.tryActivate(0,1);}},right:function(e,m){if(m.activeItem){m.activeItem.expandMenu(true);}},left:function(e,m){m.hide();if(m.parentMenu&&m.parentMenu.activeItem){m.parentMenu.activeItem.activate();}},enter:function(e,m){if(m.activeItem){e.stopPropagation();m.activeItem.onClick(e);m.fireEvent("click",this,m.activeItem);return true;}}});
 Roo.menu.MenuMgr=function(){var A,B,C={},attached=false,lastShow=new Date();function D(){A={};B=new Roo.util.MixedCollection();Roo.get(document).addKeyListener(27,function(){if(B.length>0){E();}});}function E(){if(B&&B.length>0){var c=B.clone();c.each(function(m){m.hide();});}}function F(m){B.remove(m);if(B.length<1){Roo.get(document).un("mousedown",J);attached=false;}}function G(m){var L=B.last();lastShow=new Date();B.add(m);if(!attached){Roo.get(document).on("mousedown",J);attached=true;}if(m.parentMenu){m.getEl().setZIndex(parseInt(m.parentMenu.getEl().getStyle("z-index"),10)+3);m.parentMenu.activeChild=m;}else if(L&&L.isVisible()){m.getEl().setZIndex(parseInt(L.getEl().getStyle("z-index"),10)+3);}}function H(m){if(m.activeChild){m.activeChild.hide();}if(m.autoHideTimer){clearTimeout(m.autoHideTimer);delete m.autoHideTimer;}}function I(m){var pm=m.parentMenu;if(!pm&&!m.allowOtherMenus){E();}else if(pm&&pm.activeChild&&B!=m){pm.activeChild.hide();}}function J(e){if(lastShow.getElapsed()>50&&B.length>0&&!e.getTarget(".x-menu")){E();}}function K(mi,L){if(L){var g=C[mi.group];for(var i=0,l=g.length;i<l;i++){if(g[i]!=mi){g[i].setChecked(false);}}}}return {hideAll:function(){E();},register:function(Q){if(!A){D();}
 A[Q.id]=Q;Q.on("beforehide",H);Q.on("hide",F);Q.on("beforeshow",I);Q.on("show",G);var g=Q.group;if(g&&Q.events["checkchange"]){if(!C[g]){C[g]=[];}
 C[g].push(Q);Q.on("checkchange",onCheck);}},get:function(R){if(typeof R=="string"){return A[R];}else if(R.events){return R;}else if(typeof R.length=='number'){return new Roo.menu.Menu({items:R});}else {return new Roo.menu.Menu(R);}},unregister:function(S){delete A[S.id];S.un("beforehide",H);S.un("hide",F);S.un("beforeshow",I);S.un("show",G);var g=S.group;if(g&&S.events["checkchange"]){C[g].remove(S);S.un("checkchange",onCheck);}},registerCheckable:function(T){var g=T.group;if(g){if(!C[g]){C[g]=[];}

diff --git a/roojs-debug.js b/roojs-debug.js
index 1941768..2c1d71d 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -33849,6 +33849,10 @@ var item = menu.add(
         var a = arguments, l = a.length, item;
         for(var i = 0; i < l; i++){
             var el = a[i];
+            if (typeof el == "object" && el.xtype) {
+                el = Roo.factory(el, Roo.menu);
+            }
+            
             if(el.render){ // some kind of Item
                 item = this.addItem(el);
             }else if(typeof el == "string"){ // string

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index ed1299b..f1b1b8b 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -19517,6 +19517,10 @@ var item = menu.add(
         var a = arguments, l = a.length, item;
         for(var i = 0; i < l; i++){
             var el = a[i];
+            if (typeof el == "object" && el.xtype) {
+                el = Roo.factory(el, Roo.menu);
+            }
+            
             if(el.render){ // some kind of Item
                 item = this.addItem(el);
             }else if(typeof el == "string"){ // string

diff --git a/roojs-ui.js b/roojs-ui.js
index ac2eb0c..274f12f 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -367,7 +367,7 @@ this.fireEvent("mouseover",this,e,t);},onMouseOut:function(e){var t;if(t=this.fi
 this.fireEvent("mouseout",this,e,t);},isVisible:function(){return this.el&&!this.hidden;},show:function(el,H,I){this.parentMenu=I;if(!this.el){this.render();}
 this.fireEvent("beforeshow",this);this.showAt(this.el.getAlignToXY(el,H||this.defaultAlign),I,false);},showAt:function(xy,J,_e){this.parentMenu=J;if(!this.el){this.render();}if(_e!==false){this.fireEvent("beforeshow",this);xy=this.el.adjustForConstraints(xy);}
 this.el.setXY(xy);this.el.show();this.hidden=false;this.focus();this.fireEvent("show",this);},focus:function(){if(!this.hidden){this.doFocus.defer(50,this);}},doFocus:function(){if(!this.hidden){this.focusEl.focus();}},hide:function(K){if(this.el&&this.isVisible()){this.fireEvent("beforehide",this);if(this.activeItem){this.activeItem.deactivate();this.activeItem=null;}
-this.el.hide();this.hidden=true;this.fireEvent("hide",this);}if(K===true&&this.parentMenu){this.parentMenu.hide(true);}},add:function(){var a=arguments,l=a.length,L;for(var i=0;i<l;i++){var el=a[i];if(el.render){L=this.addItem(el);}else if(typeof el=="string"){if(el=="separator"||el=="-"){L=this.addSeparator();}else {L=this.addText(el);}}else if(el.tagName||el.el){L=this.addElement(el);}else if(typeof el=="object"){L=this.addMenuItem(el);}}return L;},getEl:function(){if(!this.el){this.render();}return this.el;},addSeparator:function(){return this.addItem(new Roo.menu.Separator());},addElement:function(el){return this.addItem(new Roo.menu.BaseItem(el));},addItem:function(M){this.items.add(M);if(this.ul){var li=document.createElement("li");li.className="x-menu-list-item";this.ul.dom.appendChild(li);M.render(li,this);this.delayAutoWidth();}return M;},addMenuItem:function(N){if(!(N instanceof Roo.menu.Item)){if(typeof N.checked=="boolean"){N=new Roo.menu.CheckItem(N);}else {N=new Roo.menu.Item(N);}}return this.addItem(N);},addText:function(O){return this.addItem(new Roo.menu.TextItem(O));},insert:function(P,Q){this.items.insert(P,Q);if(this.ul){var li=document.createElement("li");li.className="x-menu-list-item";this.ul.dom.insertBefore(li,this.ul.dom.childNodes[P]);Q.render(li,this);this.delayAutoWidth();}return Q;},remove:function(R){this.items.removeKey(R.id);R.destroy();},removeAll:function(){var f;while(f=this.items.first()){this.remove(f);}}});Roo.menu.MenuNav=function(S){Roo.menu.MenuNav.superclass.constructor.call(this,S.el);this.scope=this.menu=S;};Roo.extend(Roo.menu.MenuNav,Roo.KeyNav,{doRelay:function(e,h){var k=e.getKey();if(!this.menu.activeItem&&e.isNavKeyPress()&&k!=e.SPACE&&k!=e.RETURN ){this.menu.tryActivate(0,1);return false;}return h.call(this.scope||this,e,this.menu);},up:function(e,m){if(!m.tryActivate(m.items.indexOf(m.activeItem)-1,-1)){m.tryActivate(m.items.length-1,-1);}},down:function(e,m){if(!m.tryActivate(m.items.indexOf(m.activeItem)+1,1)){m.tryActivate(0,1);}},right:function(e,m){if(m.activeItem){m.activeItem.expandMenu(true);}},left:function(e,m){m.hide();if(m.parentMenu&&m.parentMenu.activeItem){m.parentMenu.activeItem.activate();}},enter:function(e,m){if(m.activeItem){e.stopPropagation();m.activeItem.onClick(e);m.fireEvent("click",this,m.activeItem);return true;}}});
+this.el.hide();this.hidden=true;this.fireEvent("hide",this);}if(K===true&&this.parentMenu){this.parentMenu.hide(true);}},add:function(){var a=arguments,l=a.length,L;for(var i=0;i<l;i++){var el=a[i];if(typeof el=="object"&&el.xtype){el=Roo.factory(el,Roo.menu);}if(el.render){L=this.addItem(el);}else if(typeof el=="string"){if(el=="separator"||el=="-"){L=this.addSeparator();}else {L=this.addText(el);}}else if(el.tagName||el.el){L=this.addElement(el);}else if(typeof el=="object"){L=this.addMenuItem(el);}}return L;},getEl:function(){if(!this.el){this.render();}return this.el;},addSeparator:function(){return this.addItem(new Roo.menu.Separator());},addElement:function(el){return this.addItem(new Roo.menu.BaseItem(el));},addItem:function(M){this.items.add(M);if(this.ul){var li=document.createElement("li");li.className="x-menu-list-item";this.ul.dom.appendChild(li);M.render(li,this);this.delayAutoWidth();}return M;},addMenuItem:function(N){if(!(N instanceof Roo.menu.Item)){if(typeof N.checked=="boolean"){N=new Roo.menu.CheckItem(N);}else {N=new Roo.menu.Item(N);}}return this.addItem(N);},addText:function(O){return this.addItem(new Roo.menu.TextItem(O));},insert:function(P,Q){this.items.insert(P,Q);if(this.ul){var li=document.createElement("li");li.className="x-menu-list-item";this.ul.dom.insertBefore(li,this.ul.dom.childNodes[P]);Q.render(li,this);this.delayAutoWidth();}return Q;},remove:function(R){this.items.removeKey(R.id);R.destroy();},removeAll:function(){var f;while(f=this.items.first()){this.remove(f);}}});Roo.menu.MenuNav=function(S){Roo.menu.MenuNav.superclass.constructor.call(this,S.el);this.scope=this.menu=S;};Roo.extend(Roo.menu.MenuNav,Roo.KeyNav,{doRelay:function(e,h){var k=e.getKey();if(!this.menu.activeItem&&e.isNavKeyPress()&&k!=e.SPACE&&k!=e.RETURN ){this.menu.tryActivate(0,1);return false;}return h.call(this.scope||this,e,this.menu);},up:function(e,m){if(!m.tryActivate(m.items.indexOf(m.activeItem)-1,-1)){m.tryActivate(m.items.length-1,-1);}},down:function(e,m){if(!m.tryActivate(m.items.indexOf(m.activeItem)+1,1)){m.tryActivate(0,1);}},right:function(e,m){if(m.activeItem){m.activeItem.expandMenu(true);}},left:function(e,m){m.hide();if(m.parentMenu&&m.parentMenu.activeItem){m.parentMenu.activeItem.activate();}},enter:function(e,m){if(m.activeItem){e.stopPropagation();m.activeItem.onClick(e);m.fireEvent("click",this,m.activeItem);return true;}}});
 Roo.menu.MenuMgr=function(){var A,B,C={},attached=false,lastShow=new Date();function D(){A={};B=new Roo.util.MixedCollection();Roo.get(document).addKeyListener(27,function(){if(B.length>0){E();}});}function E(){if(B&&B.length>0){var c=B.clone();c.each(function(m){m.hide();});}}function F(m){B.remove(m);if(B.length<1){Roo.get(document).un("mousedown",J);attached=false;}}function G(m){var L=B.last();lastShow=new Date();B.add(m);if(!attached){Roo.get(document).on("mousedown",J);attached=true;}if(m.parentMenu){m.getEl().setZIndex(parseInt(m.parentMenu.getEl().getStyle("z-index"),10)+3);m.parentMenu.activeChild=m;}else if(L&&L.isVisible()){m.getEl().setZIndex(parseInt(L.getEl().getStyle("z-index"),10)+3);}}function H(m){if(m.activeChild){m.activeChild.hide();}if(m.autoHideTimer){clearTimeout(m.autoHideTimer);delete m.autoHideTimer;}}function I(m){var pm=m.parentMenu;if(!pm&&!m.allowOtherMenus){E();}else if(pm&&pm.activeChild&&B!=m){pm.activeChild.hide();}}function J(e){if(lastShow.getElapsed()>50&&B.length>0&&!e.getTarget(".x-menu")){E();}}function K(mi,L){if(L){var g=C[mi.group];for(var i=0,l=g.length;i<l;i++){if(g[i]!=mi){g[i].setChecked(false);}}}}return {hideAll:function(){E();},register:function(Q){if(!A){D();}
 A[Q.id]=Q;Q.on("beforehide",H);Q.on("hide",F);Q.on("beforeshow",I);Q.on("show",G);var g=Q.group;if(g&&Q.events["checkchange"]){if(!C[g]){C[g]=[];}
 C[g].push(Q);Q.on("checkchange",onCheck);}},get:function(R){if(typeof R=="string"){return A[R];}else if(R.events){return R;}else if(typeof R.length=='number'){return new Roo.menu.Menu({items:R});}else {return new Roo.menu.Menu(R);}},unregister:function(S){delete A[S.id];S.un("beforehide",H);S.un("hide",F);S.un("beforeshow",I);S.un("show",G);var g=S.group;if(g&&S.events["checkchange"]){C[g].remove(S);S.un("checkchange",onCheck);}},registerCheckable:function(T){var g=T.group;if(g){if(!C[g]){C[g]=[];}