From 7a9ac2cb877e670bbb51fd17e98f2963ab6859fb Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 16 Feb 2010 04:10:46 +0100 Subject: changed from infrastucture to public dirs --- etherpad/src/static/js/ace.js | 6 +++--- etherpad/src/static/js/linestylefilter_client.js | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/etherpad/src/static/js/ace.js b/etherpad/src/static/js/ace.js index 18fdb6c..6d5bd49 100644 --- a/etherpad/src/static/js/ace.js +++ b/etherpad/src/static/js/ace.js @@ -18,12 +18,12 @@ A.frame.style.height=(Q?Q+"px":R.style.height);A.ace_editorChangedSize();});B.se var L=function(Q){return'\''";};var G=function(Q){return'\'\\x3cscript type="text/javascript" src="'+Q+"\">\\x3c/script>'"; };var P=G;var O=L;B.destroy=C(function(){A.ace_dispose();A.frame.parentNode.removeChild(A.frame);delete F.registry[A.id]; A=null;});B.init=function(Q,S,R){B.importText(S);A.onEditorReady=function(){D=true;I();R();};(function(){var W=''; -var T=["'"+W+"'"];T.push(("('\\n\'');T.push('\' \''); var X='editorId = "'+A.id+'"; editorInfo = parent.'+K+'.registry[editorId]; window.onload = function() { window.onload = null; setTimeout(function() { var iframe = document.createElement("IFRAME"); iframe.scrolling = "no"; var outerdocbody = document.getElementById("outerdocbody"); iframe.frameBorder = 0; iframe.allowTransparency = true; outerdocbody.insertBefore(iframe, outerdocbody.firstChild); iframe.ace_outerWin = window; readyFunc = function() { editorInfo.onEditorReady(); readyFunc = null; editorInfo = null; }; var doc = iframe.contentWindow.document; doc.open(); doc.write('+T.join("+")+"); doc.close(); }, 0); }"; -var Y=[W,"",(''),'',"\x3cscript>",X,"\x3c/script>",'
x
']; +var Y=[W,"",(''),'',"\x3cscript>",X,"\x3c/script>",'
x
']; var U=document.createElement("IFRAME");U.frameBorder=0;A.frame=U;document.getElementById(Q).appendChild(U); var V=U.contentWindow.document;V.open();V.write(Y.join(""));V.close();B.adjustSize();})();};return B; } \ No newline at end of file diff --git a/etherpad/src/static/js/linestylefilter_client.js b/etherpad/src/static/js/linestylefilter_client.js index df35c3c..ca60296 100644 --- a/etherpad/src/static/js/linestylefilter_client.js +++ b/etherpad/src/static/js/linestylefilter_client.js @@ -24,7 +24,13 @@ linestylefilter.ATTRIB_CLASSES = { 'bold':'tag:b', 'italic':'tag:i', 'underline':'tag:u', - 'strikethrough':'tag:s' + 'strikethrough':'tag:s', + 'h1':'tag:h1', + 'h2':'tag:h2', + 'h3':'tag:h3', + 'h4':'tag:h4', + 'h5':'tag:h5', + 'h6':'tag:h6' }; linestylefilter.getAuthorClassName = function(author) { -- cgit v1.2.3-1-g7c22