X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FToolbar.js;h=b6ecbd6f3ecfb2283aa1fd0dfde82ed62365b83d;hb=61bc45258e16a779856dd2ad0862630b489e4583;hp=eaefa2e069945f09455233e9c15de121b0f1734a;hpb=9b3a73f2d0d8fc406f48548a1f7f0a77414cf9b3;p=roojs1 diff --git a/Roo/Toolbar.js b/Roo/Toolbar.js index eaefa2e069..b6ecbd6f3e 100644 --- a/Roo/Toolbar.js +++ b/Roo/Toolbar.js @@ -356,6 +356,12 @@ Roo.Toolbar.prototype = { * @param {HTMLElement} el */ Roo.Toolbar.Item = function(el){ + var cfg = {}; + if (typeof (el.xtype) != 'undefined') { + cfg = el; + el = cfg.el; + } + this.el = Roo.getDom(el); this.id = Roo.id(this.el); this.hidden = false; @@ -368,6 +374,7 @@ Roo.Toolbar.Item = function(el){ */ 'render': true }); + Roo.Toolbar.Item.superclass.constructor.call(this,cfg); }; Roo.extend(Roo.Toolbar.Item, Roo.util.Observable, { //Roo.Toolbar.Item.prototype = { @@ -383,8 +390,7 @@ Roo.extend(Roo.Toolbar.Item, Roo.util.Observable, { // private render : function(td){ - Roo.log("Toolbar Item - render"); - this.td = td; + this.td = td; td.appendChild(this.el); this.fireEvent('render', this); @@ -459,10 +465,15 @@ Roo.extend(Roo.Toolbar.Item, Roo.util.Observable, { * @constructor * Creates a new Separator */ -Roo.Toolbar.Separator = function(){ +Roo.Toolbar.Separator = function(cfg){ + var s = document.createElement("span"); s.className = "ytb-sep"; - Roo.Toolbar.Separator.superclass.constructor.call(this, s); + if (cfg) { + cfg.el = s; + } + + Roo.Toolbar.Separator.superclass.constructor.call(this, cfg || s); }; Roo.extend(Roo.Toolbar.Separator, Roo.Toolbar.Item, { enable:Roo.emptyFn, @@ -477,10 +488,13 @@ Roo.extend(Roo.Toolbar.Separator, Roo.Toolbar.Item, { * @constructor * Creates a new Spacer */ -Roo.Toolbar.Spacer = function(){ +Roo.Toolbar.Spacer = function(cfg){ var s = document.createElement("div"); s.className = "ytb-spacer"; - Roo.Toolbar.Spacer.superclass.constructor.call(this, s); + if (cfg) { + cfg.el = s; + } + Roo.Toolbar.Spacer.superclass.constructor.call(this, cfg || s); }; Roo.extend(Roo.Toolbar.Spacer, Roo.Toolbar.Item, { enable:Roo.emptyFn, @@ -511,22 +525,25 @@ Roo.Toolbar.Fill = Roo.extend(Roo.Toolbar.Spacer, { * Creates a new TextItem * @param {String} text */ -Roo.Toolbar.TextItem = function(text){ - if (typeof(text) == 'object') { - text = text.text; +Roo.Toolbar.TextItem = function(cfg){ + var text = cfg || ""; + if (typeof(cfg) == 'object') { + text = cfg.text || ""; + } else { + cfg = null; } var s = document.createElement("span"); s.className = "ytb-text"; s.innerHTML = text; - Roo.Toolbar.TextItem.superclass.constructor.call(this, s); + if (cfg) { + cfg.el = s; + } + + Roo.Toolbar.TextItem.superclass.constructor.call(this, cfg || s); }; Roo.extend(Roo.Toolbar.TextItem, Roo.Toolbar.Item, { - render : function(td){ - this.td = td; - Roo.Toolbar.TextItem.superclass.render.call(this, td); - }, - + enable:Roo.emptyFn, disable:Roo.emptyFn, focus:Roo.emptyFn