summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2010-02-16 04:08:36 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2010-02-16 04:08:36 +0100
commit5f770c1c952957a558bccb784441ee173f899446 (patch)
tree92a0733620dd520e37334c90f2796e8ca0cfb6ed
parent7dcede70796f204384be12788192e9a2fa067540 (diff)
downloadetherpad-5f770c1c952957a558bccb784441ee173f899446.tar.gz
etherpad-5f770c1c952957a558bccb784441ee173f899446.tar.bz2
etherpad-5f770c1c952957a558bccb784441ee173f899446.zip
moved chaged files from infrastructure to public dir
-rw-r--r--etherpad/src/etherpad/collab/ace/contentcollector.js18
-rw-r--r--etherpad/src/etherpad/collab/ace/linestylefilter.js8
2 files changed, 25 insertions, 1 deletions
diff --git a/etherpad/src/etherpad/collab/ace/contentcollector.js b/etherpad/src/etherpad/collab/ace/contentcollector.js
index 22e552a..5dd4f9c 100644
--- a/etherpad/src/etherpad/collab/ace/contentcollector.js
+++ b/etherpad/src/etherpad/collab/ace/contentcollector.js
@@ -340,6 +340,24 @@ function makeContentCollector(collectStyles, browser, apool, domInterface,
tname == "del") {
doAttrib("strikethrough");
}
+ if (tname == "h1") {
+ doAttrib("h1");
+ }
+ if (tname == "h2") {
+ doAttrib("h2");
+ }
+ if (tname == "h3") {
+ doAttrib("h3");
+ }
+ if (tname == "h4") {
+ doAttrib("h4");
+ }
+ if (tname == "h5") {
+ doAttrib("h5");
+ }
+ if (tname == "h6") {
+ doAttrib("h6");
+ }
if (tname == "ul") {
var type;
var rr = cls && /(?:^| )list-(bullet[12345678])\b/.exec(cls);
diff --git a/etherpad/src/etherpad/collab/ace/linestylefilter.js b/etherpad/src/etherpad/collab/ace/linestylefilter.js
index ffc8034..c7f79a5 100644
--- a/etherpad/src/etherpad/collab/ace/linestylefilter.js
+++ b/etherpad/src/etherpad/collab/ace/linestylefilter.js
@@ -25,7 +25,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) {