projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync
[roojs1]
/
roojs-mailer-debug.js
diff --git
a/roojs-mailer-debug.js
b/roojs-mailer-debug.js
index
8833f8f
..
6b172f9
100644
(file)
--- a/
roojs-mailer-debug.js
+++ b/
roojs-mailer-debug.js
@@
-18,7
+18,7
@@
Roo.mailer = Roo.mailer || {};
* @param {Object} config The config object
*/
* @param {Object} config The config object
*/
-_calls = 0;
+
Roo.mailer.Body = function(config){
Roo.mailer.Body.superclass.constructor.call(this, config);
Roo.mailer.Body = function(config){
Roo.mailer.Body.superclass.constructor.call(this, config);
@@
-31,8
+31,9
@@
Roo.mailer.Body = function(config){
marginheight : 0,
offset : 0
});
marginheight : 0,
offset : 0
});
- _calls++;
- if (_calls > 1) {
+ Roo.mailer.Body._calls++;
+ if (Roo.mailer.Body._calls > 1) {
+ return;
throw "test";
}
throw "test";
}
@@
-41,6
+42,8
@@
Roo.mailer.Body = function(config){
};
};
+Roo.mailer.Body._calls = 0;
+
Roo.extend(Roo.mailer.Body, Roo.bootstrap.Component, {
Roo.extend(Roo.mailer.Body, Roo.bootstrap.Component, {
@@
-139,9
+142,9
@@
Roo.extend(Roo.mailer.Block, Roo.bootstrap.Component, {
var tr = {
tag : 'tr',
cls : 'roo-m-block-tr'
var tr = {
tag : 'tr',
cls : 'roo-m-block-tr'
- }
+ }
;
if (this.blocktype != 'row') {
if (this.blocktype != 'row') {
- tr.cn = [
+
tr.cn = [
{
tag : 'td',
align : 'center',
{
tag : 'td',
align : 'center',
@@
-149,7
+152,7
@@
Roo.extend(Roo.mailer.Block, Roo.bootstrap.Component, {
cls : 'roo-m-' + this.blocktype + '-content',
html : this.html
}
cls : 'roo-m-' + this.blocktype + '-content',
html : this.html
}
- ]
+ ];
}
var cfg = {
}
var cfg = {
@@
-180,7
+183,7
@@
Roo.extend(Roo.mailer.Block, Roo.bootstrap.Component, {
align : 'center',
valign : 'top',
style : 'padding-top : 20px;',
align : 'center',
valign : 'top',
style : 'padding-top : 20px;',
- cls : 'roo-m-
row
'
+ cls : 'roo-m-
column
'
}
);
}
);
@@
-291,6
+294,7
@@
Roo.extend(Roo.mailer.BodyContainer, Roo.bootstrap.Component, {
* @cfg {String} html content of body
* @cfg {String} src image url
* @cfg {String} column (left|right)
* @cfg {String} html content of body
* @cfg {String} src image url
* @cfg {String} column (left|right)
+ * @cfg {String width (100%|200|340|260)
*
* @constructor
* Create a new Element
*
* @constructor
* Create a new Element
@@
-308,13
+312,14
@@
Roo.extend(Roo.mailer.Column, Roo.bootstrap.Component, {
html : '',
src : '',
column : 'left',
html : '',
src : '',
column : 'left',
+ width : '100%',
getAutoCreate : function(){
var tr = {
tag : 'tr',
cn : [ ]
getAutoCreate : function(){
var tr = {
tag : 'tr',
cn : [ ]
- }
+ }
;
@@
-323,11
+328,21
@@
Roo.extend(Roo.mailer.Column, Roo.bootstrap.Component, {
border : 0,
cellpadding :20,
cellspacing : 0,
border : 0,
cellpadding :20,
cellspacing : 0,
- width :
'100%'
,
+ width :
this.width
,
cn : []
};
if (this.src != '') {
cn : []
};
if (this.src != '') {
+ var img = {
+ tag : 'img',
+ src : this.src,
+ cls : 'roo-m-column-image',
+
+ style : 'max-width: ' + (this.width== '100%' ? '260' : this.width ) +'px;'
+ };
+ if (this.width != '100%' ) {
+ img.width = this.width;
+ }
cfg.cn.push({
tag : 'tr',
cn : [
cfg.cn.push({
tag : 'tr',
cn : [
@@
-336,14
+351,8
@@
Roo.extend(Roo.mailer.Column, Roo.bootstrap.Component, {
align : 'center',
valight : 'top',
cls : 'roo-m-column-'+ this.column + '-content',
align : 'center',
valight : 'top',
cls : 'roo-m-column-'+ this.column + '-content',
- cn : [
- {
- tag : 'img',
- src : this.src,
- cls : 'roo-m-column-image',
- style : 'max-width: 260px;'
- }
- ]
+ cn : [ img ]
+
}
]
});
}
]
});