diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css index 2d44f4e37..6bfb8bd23 100644 --- a/modules/editor/skins/xpresseditor/css/default.css +++ b/modules/editor/skins/xpresseditor/css/default.css @@ -1,7 +1,7 @@ @charset "utf-8"; /* NHN (developers@xpressengine.com) */ /* TextEditor */ -.xeTextEditor {overflow:hidden} +.xeTextEditor {margin:0 12px 0 0} .xeTextEditor textarea {display:block;margin:0;padding:5px} .xeTextEditor.black textarea {color:#fff;background-color:#000} /* Type Selector */ diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js index 4f2ea3299..c351188f5 100644 --- a/modules/editor/skins/xpresseditor/js/xe_interface.js +++ b/modules/editor/skins/xpresseditor/js/xe_interface.js @@ -24,7 +24,7 @@ function editorStart_xe(editor_sequence, primary_key, content_key, editor_height } // hide textarea - textarea.hide().css('width', '99%').before(iframe).after(htmlsrc); + textarea.hide().css('width', '100%').before(iframe).after(htmlsrc); // create an editor var oEditor = new xe.XpressCore(); diff --git a/modules/editor/skins/xpresseditor/js/xe_textarea.js b/modules/editor/skins/xpresseditor/js/xe_textarea.js index a488ce88e..92eb0bf8b 100644 --- a/modules/editor/skins/xpresseditor/js/xe_textarea.js +++ b/modules/editor/skins/xpresseditor/js/xe_textarea.js @@ -3,7 +3,7 @@ function editorStartTextarea(editor_sequence, content_key, primary_key) { var use_html = xGetElementById('htm_'+editor_sequence).value; obj.form.setAttribute('editor_sequence', editor_sequence); - obj.style.width = '99%'; + obj.style.width = '100%'; editorRelKeys[editor_sequence] = new Array(); editorRelKeys[editor_sequence]["primary"] = obj.form[primary_key]; diff --git a/modules/editor/skins/xpresseditor/js/xe_textarea.min.js b/modules/editor/skins/xpresseditor/js/xe_textarea.min.js index acefd5557..19634b010 100644 --- a/modules/editor/skins/xpresseditor/js/xe_textarea.min.js +++ b/modules/editor/skins/xpresseditor/js/xe_textarea.min.js @@ -1,2 +1,2 @@ -function editorStartTextarea(a,b,e){var c=xGetElementById("editor_"+a),d=xGetElementById("htm_"+a).value;c.form.setAttribute("editor_sequence",a);c.style.width="99%";editorRelKeys[a]=[];editorRelKeys[a].primary=c.form[e];editorRelKeys[a].content=c.form[b];editorRelKeys[a].func=editorGetContentTextarea;a=c.form[b].value;d&&(a=a.replace(/]*)>/ig,"\n"),"br"!=d&&(a=a.replace(/</g,"<"),a=a.replace(/>/g,">"),a=a.replace(/"/g,'"'),a=a.replace(/&/g,"&")));c.value=a} +function editorStartTextarea(a,b,e){var c=xGetElementById("editor_"+a),d=xGetElementById("htm_"+a).value;c.form.setAttribute("editor_sequence",a);c.style.width="100%";editorRelKeys[a]=[];editorRelKeys[a].primary=c.form[e];editorRelKeys[a].content=c.form[b];editorRelKeys[a].func=editorGetContentTextarea;a=c.form[b].value;d&&(a=a.replace(/]*)>/ig,"\n"),"br"!=d&&(a=a.replace(/</g,"<"),a=a.replace(/>/g,">"),a=a.replace(/"/g,'"'),a=a.replace(/&/g,"&")));c.value=a} function editorGetContentTextarea(a){var b=xGetElementById("editor_"+a),a=xGetElementById("htm_"+a).value,b=b.value.trim();a&&("br"!=a&&(b=b.replace(/&/g,"&"),b=b.replace(//g,">"),b=b.replace(/\"/g,""")),b=b.replace(/(\r\n|\n)/g,"
"));return b}; diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.js b/modules/editor/skins/xpresseditor/js/xpresseditor.js index ccb98c083..65f092fad 100644 --- a/modules/editor/skins/xpresseditor/js/xpresseditor.js +++ b/modules/editor/skins/xpresseditor/js/xpresseditor.js @@ -5787,7 +5787,7 @@ function editorStart_xe(editor_sequence, primary_key, content_key, editor_height } // hide textarea - textarea.hide().css('width', '99%').before(iframe).after(htmlsrc); + textarea.hide().css('width', '100%').before(iframe).after(htmlsrc); // create an editor var oEditor = new xe.XpressCore(); diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js index 48262b441..f4d3084dd 100644 --- a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js +++ b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js @@ -194,7 +194,7 @@ d._startSel.text(" "),a.selectNode(d._startSel.get(0).firstChild),a.collapseToSt b){var d=parseInt(c(a).attr(b+"span"));return isNaN(d)?1:d}}).extend(xe.XE_Table)})(jQuery);window.xe||(xe={});xe.Editors=[]; function editorStart_xe(c,l,o,p,a,b,d,e){function f(){try{var a=n.contentWindow.document;if("about:blank"==a.location)throw"blank";j.registerPlugin(new xe.XE_EditingArea_WYSIWYG(n));j.registerPlugin(new xe.XpressRangeManager(n));j.registerPlugin(new xe.XE_ExecCommand(n));if(d&&!a.body.style.fontFamily)a.body.style.fontFamily=d;if(e&&!a.body.style.fontSize)a.body.style.fontSize=e;j.run()}catch(b){setTimeout(f,0)}}"undefined"==typeof a&&(a="white");"undefined"==typeof b&&(b="xeStyle");"undefined"== typeof d&&(d="");"undefined"==typeof e&&(e="");var g=request_uri+"modules/editor/styles/"+b+"/editor.html",b=jQuery("#xpress-editor-"+c),g=jQuery('