aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2010-02-05 01:27:00 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2010-02-05 01:27:00 +0100
commit06ba710dccff087c8546aee7812487693ea7e88c (patch)
tree663e6e2ab249b39fb664d3e140fe70474d21ad8a /infrastructure
parent8a34feb2f88b78a15fb145846df29662803183f9 (diff)
downloadetherpad-06ba710dccff087c8546aee7812487693ea7e88c.tar.gz
etherpad-06ba710dccff087c8546aee7812487693ea7e88c.tar.xz
etherpad-06ba710dccff087c8546aee7812487693ea7e88c.zip
try to implement headlines
Diffstat (limited to 'infrastructure')
-rw-r--r--infrastructure/ace/www/ace2_inner.js3
-rw-r--r--infrastructure/ace/www/contentcollector.js3
-rw-r--r--infrastructure/ace/www/linestylefilter.js3
3 files changed, 7 insertions, 2 deletions
diff --git a/infrastructure/ace/www/ace2_inner.js b/infrastructure/ace/www/ace2_inner.js
index afd1e35..94aba87 100644
--- a/infrastructure/ace/www/ace2_inner.js
+++ b/infrastructure/ace/www/ace2_inner.js
@@ -752,6 +752,7 @@ function OUTER(gscope) {
italic: function() { toggleAttributeOnSelection('italic'); },
underline: function() { toggleAttributeOnSelection('underline'); },
strikethrough: function() { toggleAttributeOnSelection('strikethrough'); },
+ h1: function() { toggleAttributeOnSelection('h1'); },
undo: function() { doUndoRedo('undo'); },
redo: function() { doUndoRedo('redo'); },
clearauthorship: function(prompt) {
@@ -1531,7 +1532,7 @@ function OUTER(gscope) {
}
var STYLE_ATTRIBS = {bold: true, italic: true, underline: true,
- strikethrough: true, list: true};
+ strikethrough: true, h1: true, list: true};
var OTHER_INCORPED_ATTRIBS = {insertorder: true, author: true};
function isStyleAttribute(aname) {
diff --git a/infrastructure/ace/www/contentcollector.js b/infrastructure/ace/www/contentcollector.js
index c5d8ddb..41922d7 100644
--- a/infrastructure/ace/www/contentcollector.js
+++ b/infrastructure/ace/www/contentcollector.js
@@ -340,6 +340,9 @@ function makeContentCollector(collectStyles, browser, apool, domInterface,
tname == "del") {
doAttrib("strikethrough");
}
+ if (tname == "h1") {
+ doAttrib("h1");
+ }
if (tname == "ul") {
var type;
var rr = cls && /(?:^| )list-(bullet[12345678])\b/.exec(cls);
diff --git a/infrastructure/ace/www/linestylefilter.js b/infrastructure/ace/www/linestylefilter.js
index 0ac578b..3514859 100644
--- a/infrastructure/ace/www/linestylefilter.js
+++ b/infrastructure/ace/www/linestylefilter.js
@@ -25,7 +25,8 @@ linestylefilter.ATTRIB_CLASSES = {
'bold':'tag:b',
'italic':'tag:i',
'underline':'tag:u',
- 'strikethrough':'tag:s'
+ 'strikethrough':'tag:s',
+ 'h1':'tag:h1'
};
linestylefilter.getAuthorClassName = function(author) {