projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
64a7f21
)
Roo/bootstrap/panel/Content.js
author
john
<john@roojs.com>
Tue, 28 Nov 2017 03:56:34 +0000
(11:56 +0800)
committer
john
<john@roojs.com>
Tue, 28 Nov 2017 03:56:34 +0000
(11:56 +0800)
Roo/bootstrap/panel/Content.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/panel/Content.js
b/Roo/bootstrap/panel/Content.js
index
ed82419
..
84939e3
100644
(file)
--- a/
Roo/bootstrap/panel/Content.js
+++ b/
Roo/bootstrap/panel/Content.js
@@
-20,9
+20,7
@@
* @cfg {String/HTMLElement/Element} resizeEl An element to resize if {@link #fitToFrame} is true (instead of this panel's element)
* @cfg {Toolbar} toolbar A toolbar for this panel
* @cfg {Boolean} autoScroll True to scroll overflow in this panel (use with {@link #fitToFrame})
* @cfg {String/HTMLElement/Element} resizeEl An element to resize if {@link #fitToFrame} is true (instead of this panel's element)
* @cfg {Toolbar} toolbar A toolbar for this panel
* @cfg {Boolean} autoScroll True to scroll overflow in this panel (use with {@link #fitToFrame})
- * @cfg {String|Object} title The title for this panel or object { 'xs-sm-md' : 'small title' , 'lg' : medim title ....}
-
- *
+ * @cfg {String} title The title for this panel
* @cfg {Array} adjustments Values to <b>add</b> to the width/height when doing a {@link #fitToFrame} (default is [0, 0])
* @cfg {String} url Calls {@link #setUrl} with this value
* @cfg {String} region (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)
* @cfg {Array} adjustments Values to <b>add</b> to the width/height when doing a {@link #fitToFrame} (default is [0, 0])
* @cfg {String} url Calls {@link #setUrl} with this value
* @cfg {String} region (center|north|south|east|west) which region to put this panel on (when used with xtype constructors)
@@
-116,14
+114,6
@@
Roo.bootstrap.panel.Content = function( config){
Roo.apply(this, config);
}
Roo.apply(this, config);
}
- // convert 'title' object into a string
- // eg.
- // { 'xs-sm' : 'atitle', "md-lg": "xxxx"}
- // becomes:
- // <spam class="visible-xs .visible-sm">+hhhh+</span><span class="visible-md .visible-lg">{1}<span>
- // show a roo.log messages if a size is not found ....
-
-
if(this.resizeEl){
this.resizeEl = Roo.get(this.resizeEl, true);
}else{
if(this.resizeEl){
this.resizeEl = Roo.get(this.resizeEl, true);
}else{
@@
-384,7
+374,7
@@
panel.load({
* @return {String}
*/
getTitle : function(){
* @return {String}
*/
getTitle : function(){
- return this.title
+'testing'
;
+ return this.title;
},
/**
},
/**