diff options
author | Simon B @piratpartiet <simonb@redhog.org> | 2010-04-21 23:31:54 +0200 |
---|---|---|
committer | Simon B @piratpartiet <simonb@redhog.org> | 2010-04-21 23:31:54 +0200 |
commit | beb002e2b700305afae26355018c7f23441451c2 (patch) | |
tree | 1311acf84e9be4934108bb47a89797f191ef90a7 /etherpad/src/plugins/twitterStyleTags/main.js | |
parent | 9b3549217642995834d7166456ab8d14e0c99d99 (diff) | |
parent | a1b52bd59f990726178addb42772cf5a4130b808 (diff) | |
download | etherpad-beb002e2b700305afae26355018c7f23441451c2.tar.gz etherpad-beb002e2b700305afae26355018c7f23441451c2.tar.bz2 etherpad-beb002e2b700305afae26355018c7f23441451c2.zip |
Merge commit 'mainline/master'
Diffstat (limited to 'etherpad/src/plugins/twitterStyleTags/main.js')
-rw-r--r-- | etherpad/src/plugins/twitterStyleTags/main.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etherpad/src/plugins/twitterStyleTags/main.js b/etherpad/src/plugins/twitterStyleTags/main.js index 34d5d85..d64abff 100644 --- a/etherpad/src/plugins/twitterStyleTags/main.js +++ b/etherpad/src/plugins/twitterStyleTags/main.js @@ -5,13 +5,15 @@ import("sqlbase.sqlobj"); import("sqlbase.sqlcommon"); function init() { - this.hooks = ['handlePath', 'aceGetFilterStack', 'aceCreateDomLine', 'padModelWriteToDB']; + this.hooks = ['handlePath', 'aceGetFilterStack', 'aceCreateDomLine', 'padModelWriteToDB', 'docbarItemsAll', 'docbarItemsTagBrowser']; this.client = new main.init(); this.description = 'Twitter-style tags allows the user to tag pads by writing #tagname anywhere in the pad text. Tags are automatically linked to searches for that tag in other pads. This plugin also provides an alternative home-page for Etherpad with a display of the last changed public pads as well as that information available as an RSS stream.'; this.handlePath = hooks.handlePath; this.aceGetFilterStack = main.aceGetFilterStack; this.aceCreateDomLine = main.aceCreateDomLine; this.padModelWriteToDB = hooks.padModelWriteToDB; + this.docbarItemsAll = hooks.docbarItemsAll; + this.docbarItemsTagBrowser = hooks.docbarItemsTagBrowser; this.install = install; this.uninstall = uninstall; |