From 6251820266e031e351396634b8e02ee37e51989a Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@akbkhome.com>
Date: Tue, 14 Feb 2012 15:47:12 +0800
Subject: [PATCH] roojs-ui.js roojs-ui.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js
 roojs-ui-debug.js roojs-ui-debug.js roojs-ui-debug.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js roojs-ui.js
 roojs-ui.js roojs-ui.js

---
 roojs-ui-debug.js | 2 +-
 roojs-ui.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 1e0937f1f0..44e10b24ee 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -24565,7 +24565,7 @@ Roo.form.HtmlEditor = Roo.extend(Roo.form.Field, {
             }
             html = this.cleanHtml(html);
             // fix up the special chars..
-            html.replace(/([\x80-\uffff])/g, function (a, b) {
+            html = html.replace(/([\x80-\uffff])/g, function (a, b) {
                 return "&#"+b.charCodeAt()+";" 
             });
             if(this.fireEvent('beforesync', this, html) !== false){
diff --git a/roojs-ui.js b/roojs-ui.js
index b486479b32..b87bee9a9f 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -552,7 +552,7 @@ this.wrap=this.el.wrap({cls:'x-html-editor-wrap',cn:{cls:'x-html-editor-tb'}});i
 this.frameId=Roo.id();this.createToolbar(this);var B=this.wrap.createChild({tag:'iframe',id:this.frameId,name:this.frameId,frameBorder:'no','src':Roo.SSL_SECURE_URL?Roo.SSL_SECURE_URL:"javascript:false"},this.el);this.iframe=B.dom;this.assignDocWin();this.doc.designMode='on';this.doc.open();this.doc.write(this.getDocMarkup());this.doc.close();var C={run:function(){this.assignDocWin();if(this.doc.body||this.doc.readyState=='complete'){try{this.doc.designMode="on";}catch(e){return;}
 Roo.TaskMgr.stop(C);this.initEditor.defer(10,this);}},interval:10,duration:10000,scope:this};Roo.TaskMgr.start(C);if(!this.width){this.setSize(this.wrap.getSize());}if(this.resizeEl){this.resizeEl.resizeTo.defer(100,this.resizeEl,[this.width,this.height]);}},onResize:function(w,h){Roo.form.HtmlEditor.superclass.onResize.apply(this,arguments);if(this.el&&this.iframe){if(typeof w=='number'){var aw=w-this.wrap.getFrameWidth('lr');this.el.setWidth(this.adjustWidth('textarea',aw));this.iframe.style.width=aw+'px';}if(typeof h=='number'){var A=0;for(var i=0;i<this.toolbars.length;i++){A+=this.toolbars[i].tb.el.getHeight();if(this.toolbars[i].footer){A+=this.toolbars[i].footer.el.getHeight();}}var ah=h-this.wrap.getFrameWidth('tb')-A;ah-=5;this.el.setHeight(this.adjustWidth('textarea',ah));this.iframe.style.height=ah+'px';if(this.doc){(this.doc.body||this.doc.documentElement).style.height=(ah-(this.iframePad*2))+'px';}}}},toggleSourceEdit:function(A){this.sourceEditMode=A===true;if(this.sourceEditMode){this.syncValue();this.iframe.className='x-hidden';this.el.removeClass('x-hidden');this.el.dom.removeAttribute('tabIndex');this.el.focus();}else {this.pushValue();this.iframe.className='';this.el.addClass('x-hidden');this.el.dom.setAttribute('tabIndex',-1);this.deferFocus();}
 this.setSize(this.wrap.getSize());this.fireEvent('editmodechange',this,this.sourceEditMode);},createLink:function(){var A=prompt(this.createLinkText,this.defaultLinkValue);if(A&&A!='http:/'+'/'){this.relayCmd('createlink',A);}},adjustSize:Roo.BoxComponent.prototype.adjustSize,getResizeEl:function(){return this.wrap;},getPositionEl:function(){return this.wrap;},initEvents:function(){this.originalValue=this.getValue();},markInvalid:Roo.emptyFn,clearInvalid:Roo.emptyFn,setValue:function(v){Roo.form.HtmlEditor.superclass.setValue.call(this,v);this.pushValue();},cleanHtml:function(A){A=String(A);if(A.length>5){if(Roo.isSafari){A=A.replace(/\sclass="(?:Apple-style-span|khtml-block-placeholder)"/gi,'');}}if(A=='&nbsp;'){A='';}return A;},syncValue:function(){if(this.initialized){var bd=(this.doc.body||this.doc.documentElement);var A=bd.innerHTML;if(Roo.isSafari){var bs=bd.getAttribute('style');var m=bs.match(/text-align:(.*?);/i);if(m&&m[1]){A='<div style="'+m[0]+'">'+A+'</div>';}}
-A=this.cleanHtml(A);A.replace(/([\x80-\uffff])/g,function(a,b){return "&#"+b.charCodeAt()+";"});if(this.fireEvent('beforesync',this,A)!==false){this.el.dom.value=A;this.fireEvent('sync',this,A);}}},pushValue:function(){if(this.initialized){var v=this.el.dom.value;if(v.length<1){v='&#160;';}if(this.fireEvent('beforepush',this,v)!==false){var d=(this.doc.body||this.doc.documentElement);d.innerHTML=v;this.cleanUpPaste();this.el.dom.value=d.innerHTML;this.fireEvent('push',this,v);}}},deferFocus:function(){this.focus.defer(10,this);},focus:function(){if(this.win&&!this.sourceEditMode){this.win.focus();}else {this.el.focus();}},assignDocWin:function(){var A=this.iframe;if(Roo.isIE){this.doc=A.contentWindow.document;this.win=A.contentWindow;}else {if(!Roo.get(this.frameId)){return;}
+A=this.cleanHtml(A);A=A.replace(/([\x80-\uffff])/g,function(a,b){return "&#"+b.charCodeAt()+";"});if(this.fireEvent('beforesync',this,A)!==false){this.el.dom.value=A;this.fireEvent('sync',this,A);}}},pushValue:function(){if(this.initialized){var v=this.el.dom.value;if(v.length<1){v='&#160;';}if(this.fireEvent('beforepush',this,v)!==false){var d=(this.doc.body||this.doc.documentElement);d.innerHTML=v;this.cleanUpPaste();this.el.dom.value=d.innerHTML;this.fireEvent('push',this,v);}}},deferFocus:function(){this.focus.defer(10,this);},focus:function(){if(this.win&&!this.sourceEditMode){this.win.focus();}else {this.el.focus();}},assignDocWin:function(){var A=this.iframe;if(Roo.isIE){this.doc=A.contentWindow.document;this.win=A.contentWindow;}else {if(!Roo.get(this.frameId)){return;}
 this.doc=(A.contentDocument||Roo.get(this.frameId).dom.document);this.win=Roo.get(this.frameId).dom.contentWindow;}},initEditor:function(){this.assignDocWin();this.doc.designMode="on";this.doc.open();this.doc.write(this.getDocMarkup());this.doc.close();var A=(this.doc.body||this.doc.documentElement);var ss=this.el.getStyles('font-size','background-image','background-repeat');ss['background-attachment']='fixed';A.bgProperties='fixed';Roo.DomHelper.applyStyles(A,ss);Roo.EventManager.on(this.doc,{'mouseup':this.onEditorEvent,'dblclick':this.onEditorEvent,'click':this.onEditorEvent,'keyup':this.onEditorEvent,buffer:100,scope:this});if(Roo.isGecko){Roo.EventManager.on(this.doc,'keypress',this.mozKeyPress,this);}if(Roo.isIE||Roo.isSafari||Roo.isOpera){Roo.EventManager.on(this.doc,'keydown',this.fixKeys,this);}
 this.initialized=true;this.fireEvent('initialize',this);this.pushValue();},onDestroy:function(){if(this.rendered){for(var i=0;i<this.toolbars.length;i++){this.toolbars[i].onDestroy();}
 this.wrap.dom.innerHTML='';this.wrap.remove();}},onFirstFocus:function(){this.assignDocWin();this.activated=true;for(var i=0;i<this.toolbars.length;i++){this.toolbars[i].onFirstFocus();}if(Roo.isGecko){this.win.focus();var s=this.win.getSelection();if(!s.focusNode||s.focusNode.nodeType!=3){var r=s.getRangeAt(0);r.selectNodeContents((this.doc.body||this.doc.documentElement));r.collapse(true);this.deferFocus();}try{this.execCmd('useCSS',true);this.execCmd('styleWithCSS',false);}catch(e){}}
-- 
2.39.2