projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove debugging code
[roojs1]
/
Roo
/
Toolbar.js
diff --git
a/Roo/Toolbar.js
b/Roo/Toolbar.js
index
cf8f214
..
b6ecbd6
100644
(file)
--- a/
Roo/Toolbar.js
+++ b/
Roo/Toolbar.js
@@
-356,6
+356,7
@@
Roo.Toolbar.prototype = {
* @param {HTMLElement} el
*/
Roo.Toolbar.Item = function(el){
* @param {HTMLElement} el
*/
Roo.Toolbar.Item = function(el){
+ var cfg = {};
if (typeof (el.xtype) != 'undefined') {
cfg = el;
el = cfg.el;
if (typeof (el.xtype) != 'undefined') {
cfg = el;
el = cfg.el;
@@
-464,10
+465,15
@@
Roo.extend(Roo.Toolbar.Item, Roo.util.Observable, {
* @constructor
* Creates a new Separator
*/
* @constructor
* Creates a new Separator
*/
-Roo.Toolbar.Separator = function(){
+Roo.Toolbar.Separator = function(cfg){
+
var s = document.createElement("span");
s.className = "ytb-sep";
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,
};
Roo.extend(Roo.Toolbar.Separator, Roo.Toolbar.Item, {
enable:Roo.emptyFn,
@@
-482,10
+488,13
@@
Roo.extend(Roo.Toolbar.Separator, Roo.Toolbar.Item, {
* @constructor
* Creates a new Spacer
*/
* @constructor
* Creates a new Spacer
*/
-Roo.Toolbar.Spacer = function(){
+Roo.Toolbar.Spacer = function(
cfg
){
var s = document.createElement("div");
s.className = "ytb-spacer";
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,
};
Roo.extend(Roo.Toolbar.Spacer, Roo.Toolbar.Item, {
enable:Roo.emptyFn,
@@
-516,14
+525,21
@@
Roo.Toolbar.Fill = Roo.extend(Roo.Toolbar.Spacer, {
* Creates a new TextItem
* @param {String} text
*/
* 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;
}
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, {
};
Roo.extend(Roo.Toolbar.TextItem, Roo.Toolbar.Item, {