roojs-all.js

diff --git a/roojs-all.js b/roojs-all.js
index bd7b9b6..a862192 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -734,7 +734,7 @@ this.editor.toggleSourceEdit(A);},buttonTips:{bold:{title:'Bold (Ctrl+B)',text:'
 A.destroy();});}},onFirstFocus:function(){this.tb.items.each(function(A){A.enable();});}});
 Roo.form.HtmlEditor.ToolbarContext=function(A){Roo.apply(this,A);this.styles=this.styles||{};}
 Roo.form.HtmlEditor.ToolbarContext.types={'IMG':{width:{title:"Width",width:40},height:{title:"Height",width:40},align:{title:"Align",opts:[[""],["left"],["right"],["center"],["top"]],width:80},border:{title:"Border",width:40},alt:{title:"Alt",width:120},src:{title:"Src",width:220}},'A':{name:{title:"Name",width:50},href:{title:"Href",width:220}},'TABLE':{rows:{title:"Rows",width:20},cols:{title:"Cols",width:20},width:{title:"Width",width:40},height:{title:"Height",width:40},border:{title:"Border",width:20}},'TD':{width:{title:"Width",width:40},height:{title:"Height",width:40},align:{title:"Align",opts:[[""],["left"],["center"],["right"],["justify"],["char"]],width:80},valign:{title:"Valign",opts:[[""],["top"],["middle"],["bottom"],["baseline"]],width:80},colspan:{title:"Colspan",width:20}},'INPUT':{name:{title:"name",width:120},value:{title:"Value",width:120},width:{title:"Width",width:40}},'LABEL':{'for':{title:"For",width:120}},'TEXTAREA':{name:{title:"name",width:120},rows:{title:"Rows",width:20},cols:{title:"Cols",width:20}},'SELECT':{name:{title:"name",width:120},selectoptions:{title:"Options",width:200}},'BODY':{title:{title:"title",width:200,disabled:true}},'*':{}};Roo.apply(Roo.form.HtmlEditor.ToolbarContext.prototype,{tb:false,rendered:false,editor:false,disable:false,styles:false,toolbars:false,init:function(A){this.editor=A;var B=A.frameId;var C=this;function btn(id,E,F){var G=B+'-'+id;return {id:G,cmd:id,cls:'x-btn-icon x-edit-'+id,enableToggle:E!==false,scope:A,handler:F||A.relayBtnCmd,clickEvent:'mousedown',tooltip:C.buttonTips[id]||undefined,tabIndex:-1};}var D=A.wrap.createChild({tag:'div'},A.wrap.dom.firstChild.nextSibling,true);var ty=Roo.form.HtmlEditor.ToolbarContext.types;this.toolbars={};for(var i in ty){this.toolbars[i]=this.buildToolbar(ty[i],i);}
-this.tb=this.toolbars.BODY;this.tb.el.show();this.buildFooter();this.footer.show();this.rendered=true;A.on('editorevent',this.updateToolbar,this);},updateToolbar:function(A,B,C){if(!this.editor.activated){this.editor.onFirstFocus();return;}var D=C?false:true;var E=this.editor.getAllAncestors();var ty=Roo.form.HtmlEditor.ToolbarContext.types;if(!C){C=E.length?(E[0]?E[0]:E[1]):this.editor.doc.body;C=C?C:this.editor.doc.body;C=C.tagName.length?C:this.editor.doc.body;}var tn=C.tagName.toUpperCase();tn=C.tagName.toUpperCase();if(this.tb.name!=tn){this.tb.el.hide();this.tb=typeof(ty[tn])!='undefined'?this.toolbars[tn]:this.toolbars['*'];this.tb.el.show();this.tb.items.first().el.innerHTML=tn+': ';if(this.tb.fields){this.tb.fields.each(function(e){e.setValue(C.getAttribute(e.name));});}var st=this.tb.fields.item(0);st.store.removeAll();var cn=C.className.split(/\s+/);var F=[];if(this.styles['*']){Roo.each(this.styles['*'],function(v){F.push([v,cn.indexOf(v)>-1?1:0]);});}if(this.styles[tn]){Roo.each(this.styles[tn],function(v){F.push([v,cn.indexOf(v)>-1?1:0]);});}
+this.tb=this.toolbars.BODY;this.tb.el.show();this.buildFooter();this.footer.show();this.rendered=true;A.on('editorevent',this.updateToolbar,this);},updateToolbar:function(A,B,C){if(!this.editor.activated){this.editor.onFirstFocus();return;}var D=C?false:true;var E=this.editor.getAllAncestors();var ty=Roo.form.HtmlEditor.ToolbarContext.types;if(!C){C=E.length?(E[0]?E[0]:E[1]):this.editor.doc.body;C=C?C:this.editor.doc.body;C=C.tagName.length?C:this.editor.doc.body;}var tn=C.tagName.toUpperCase();tn=C.tagName.toUpperCase();this.tb.selectedNode=C;if(this.tb.name!=tn){this.tb.el.hide();this.tb=typeof(ty[tn])!='undefined'?this.toolbars[tn]:this.toolbars['*'];this.tb.el.show();this.tb.items.first().el.innerHTML=tn+': ';if(this.tb.fields){this.tb.fields.each(function(e){e.setValue(C.getAttribute(e.name));});}var st=this.tb.fields.item(0);st.store.removeAll();var cn=C.className.split(/\s+/);var F=[];if(this.styles['*']){Roo.each(this.styles['*'],function(v){F.push([v,cn.indexOf(v)>-1?1:0]);});}if(this.styles[tn]){Roo.each(this.styles[tn],function(v){F.push([v,cn.indexOf(v)>-1?1:0]);});}
 st.store.loadData(F);st.collapse();st.setValue(cn);this.tb.selectedNode=C;Roo.menu.MenuMgr.hideAll();}if(!D){return;}var G='';this.footerEls=E.reverse();Roo.each(this.footerEls,function(a,i){if(!a){return;}
 G+=G.length?' &gt; ':'';G+='<span class="x-ed-loc-'+i+'">'+a.tagName+'</span>';});var sz=this.footDisp.up('td').getSize();this.footDisp.dom.style.width=(sz.width-10)+'px';this.footDisp.dom.style.marginLeft='5px';this.footDisp.dom.style.overflow='hidden';this.footDisp.dom.innerHTML=G;},onDestroy:function(){if(this.rendered){this.tb.items.each(function(A){if(A.menu){A.menu.removeAll();if(A.menu.el){A.menu.el.destroy();}}
 A.destroy();});}},onFirstFocus:function(){this.tb.items.each(function(A){A.enable();});},buildToolbar:function(A,nm){var B=this.editor;var C=B.wrap.createChild({tag:'div'},B.wrap.dom.firstChild.nextSibling,true);var tb=new Roo.Toolbar(C);tb.add(nm+":&nbsp;");if(this.styles){tb.addField(new Roo.form.ComboBox({store:new Roo.data.SimpleStore({id:'val',fields:['val','selected'],data:[]}),name:'className',displayField:'val',typeAhead:false,mode:'local',editable:false,triggerAction:'all',emptyText:'Select Style',selectOnFocus:true,width:130,listeners:{'select':function(c,r,i){tb.selectedNode.className=r?r.get('val'):'';}}}));}for(var i in A){var D=A[i];tb.add(D.title+":&nbsp;");if(D.opts){tb.addField(new Roo.form.ComboBox({store:new Roo.data.SimpleStore({id:'val',fields:['val'],data:D.opts}),name:i,displayField:'val',typeAhead:false,mode:'local',editable:false,triggerAction:'all',emptyText:'Select',selectOnFocus:true,width:D.width?D.width:130,listeners:{'select':function(c,r,i){tb.selectedNode.setAttribute(c.name,r.get('val'));}}}));continue;tb.addField(new Roo.form.TextField({name:i,width:100,value:''}));continue;}