From 16ea5d5dd6581bf753525641023d73c6f4a7051a Mon Sep 17 00:00:00 2001
From: edward <edward@roojs.com>
Date: Fri, 18 Sep 2015 12:15:29 +0800
Subject: [PATCH] roojs-mailer.js roojs-mailer-debug.js

---
 roojs-mailer-debug.js | 24 +++++++++++++++---------
 roojs-mailer.js       |  3 ++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/roojs-mailer-debug.js b/roojs-mailer-debug.js
index 4cf60545e7..c0e560e813 100644
--- a/roojs-mailer-debug.js
+++ b/roojs-mailer-debug.js
@@ -291,6 +291,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 width (100%|200|340|260)
  * 
  * @constructor
  * Create a new Element
@@ -308,6 +309,7 @@ Roo.extend(Roo.mailer.Column, Roo.bootstrap.Component,  {
     html : '',
     src : '',
     column : 'left',
+    width : '100%',
      
     getAutoCreate : function(){
                                             
@@ -323,11 +325,21 @@ Roo.extend(Roo.mailer.Column, Roo.bootstrap.Component,  {
             border : 0,
             cellpadding :20,
             cellspacing : 0,
-            width : '100%',
+            width : this.width,
             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 : [
@@ -336,14 +348,8 @@ Roo.extend(Roo.mailer.Column, Roo.bootstrap.Component,  {
                         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 ]
+                            
                     }
                 ]
             });
diff --git a/roojs-mailer.js b/roojs-mailer.js
index 7ac3d5a1de..f06caece5f 100644
--- a/roojs-mailer.js
+++ b/roojs-mailer.js
@@ -6,5 +6,6 @@ Roo.mailer.Block=function(A){Roo.mailer.Block.superclass.constructor.call(this,A
 //Roo/mailer/BodyContainer.js
 Roo.mailer.BodyContainer=function(A){Roo.mailer.BodyContainer.superclass.constructor.call(this,A);};Roo.extend(Roo.mailer.BodyContainer,Roo.bootstrap.Component,{cls:'',getAutoCreate:function(){var A={tag:'table',border:0,cellpadding:0,cellspacing:0,cls:'roo-m-body-container '+this.cls,cn:[{tag:'tbody'}]};return A;},getChildContainer:function(){var tr=this.el.select('tbody',true).first().createChild({tag:'tr',cn:[{tag:'td',align:'center',valign:'top',cls:'roo-m-child-ctr'}]});return tr.select('.roo-m-child-ctr').first();}});
 //Roo/mailer/Column.js
-Roo.mailer.Column=function(A){Roo.mailer.Column.superclass.constructor.call(this,A);};Roo.extend(Roo.mailer.Column,Roo.bootstrap.Component,{cls:'',html:'',src:'',column:'left',getAutoCreate:function(){var tr={tag:'tr',cn:[]};var cfg={tag:'table',border:0,cellpadding:20,cellspacing:0,width:'100%',cn:[]};if(this.src!=''){cfg.cn.push({tag:'tr',cn:[{tag:'td',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;'}]}]});}
+Roo.mailer.Column=function(A){Roo.mailer.Column.superclass.constructor.call(this,A);};Roo.extend(Roo.mailer.Column,Roo.bootstrap.Component,{cls:'',html:'',src:'',column:'left',width:'100%',getAutoCreate:function(){var tr={tag:'tr',cn:[]};var cfg={tag:'table',border:0,cellpadding:20,cellspacing:0,width:this.width,cn:[]};if(this.src!=''){var A={tag:'img',src:this.src,cls:'roo-m-column-image',style:'max-width: '+(this.width=='100%'?'260':this.width)+'px;'};if(this.width!='100%'){A.width=this.width;}
+cfg.cn.push({tag:'tr',cn:[{tag:'td',align:'center',valight:'top',cls:'roo-m-column-'+this.column+'-content',cn:[A]}]});}
 cfg.cn.push({tag:'tr',cn:[{tag:'td',align:'center',valight:'top',cls:'roo-m-column-'+this.column+'-content roo-m-column-body',html:this.html}]});return cfg;},getChildContainer:function(){return this.el.select('.roo-m-column-body',true).first();}});
-- 
2.39.2