summaryrefslogtreecommitdiffstats
path: root/etherpad/src/plugins
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2010-03-27 16:24:38 +0100
committerEgil Moeller <egil.moller@freecode.no>2010-03-27 16:24:38 +0100
commit5f64acd821d60085fd9ce96faacb0b326240d4d4 (patch)
tree71890a8a6f8b7fb5b241bfd663fddab5abba04c3 /etherpad/src/plugins
parent5b71b7e4a3a99581be63907e9758a236726c6a74 (diff)
downloadetherpad-5f64acd821d60085fd9ce96faacb0b326240d4d4.tar.gz
etherpad-5f64acd821d60085fd9ce96faacb0b326240d4d4.tar.bz2
etherpad-5f64acd821d60085fd9ce96faacb0b326240d4d4.zip
Added styling of tags in the editor
Diffstat (limited to 'etherpad/src/plugins')
-rw-r--r--etherpad/src/plugins/twitterStyleTags/static/js/main.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/etherpad/src/plugins/twitterStyleTags/static/js/main.js b/etherpad/src/plugins/twitterStyleTags/static/js/main.js
index eae0c4f..07da57e 100644
--- a/etherpad/src/plugins/twitterStyleTags/static/js/main.js
+++ b/etherpad/src/plugins/twitterStyleTags/static/js/main.js
@@ -1,9 +1,14 @@
function init() {
- this.hooks = ['aceGetFilterStack', 'aceCreateDomLine'];
+ this.hooks = ['aceInitInnerdocbodyHead', 'aceGetFilterStack', 'aceCreateDomLine'];
+ this.aceInitInnerdocbodyHead = aceInitInnerdocbodyHead;
this.aceGetFilterStack = aceGetFilterStack;
this.aceCreateDomLine = aceCreateDomLine;
}
+function aceInitInnerdocbodyHead(args) {
+ args.iframeHTML.push('\'<link rel="stylesheet" type="text/css" href="/static/css/plugins/twitterStyleTags/pad.css"/>\'');
+}
+
function aceGetFilterStack(args) {
return [args.linestylefilter.getRegexpFilter(
new RegExp("#[^,#!\\s][^,#!\\s]*", "g"), 'padtag')];