NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Integrated hooks into templates and provided a blokc/hook for the left and right editbar menu

Browse source
This commit is contained in:
Egil Moeller 2012-03-13 20:32:56 +01:00
parent 05c2e0fde5
commit a5366a0a16
5 changed files with 83 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
available_plugins/ep_fintest/ep.json
View file

@ -25,7 +25,8 @@
"hooks": { "hooks": {
"somehookname": "ep_fintest/otherpart:somehook", "somehookname": "ep_fintest/otherpart:somehook",
"morehook": "ep_fintest/otherpart:morehook", "morehook": "ep_fintest/otherpart:morehook",
"expressCreateServer": "ep_fintest/otherpart:expressServer" "expressCreateServer": "ep_fintest/otherpart:expressServer",
"eejsBlock_editbarMenuLeft": "ep_fintest/otherpart:eejsBlock_editbarMenuLeft"
}, },
"client_hooks": { "client_hooks": {
"somehookname": "ep_fintest/static/js/test:bar" "somehookname": "ep_fintest/static/js/test:bar"

9
available_plugins/ep_fintest/otherpart.js
View file

@ -14,3 +14,12 @@ exports.expressServer = function (hook_name, args, cb) {
res.send("<em>Abra cadabra</em>"); res.send("<em>Abra cadabra</em>");
}); });
} }
exports.eejsBlock_editbarMenuLeft = function (hook_name, args, cb) {
args.content = args.content + '\
<li id="testButton" onClick="window.pad&amp;&amp;pad.editbarClick(\'clearauthorship\');return false;">\
<a class="buttonicon buttonicon-test" title="Test test test"></a>\
</li>\
';
return cb();
}

2
src/node/eejs/examples/foo.ejs
View file

@ -2,4 +2,6 @@
<% e.begin_define_block("foo"); %> <% e.begin_define_block("foo"); %>
YY YY
<% e.super(); %>
ZZ
<% e.end_define_block(); %> <% e.end_define_block(); %>

16
src/node/eejs/index.js
View file

@ -16,12 +16,13 @@
/* Basic usage: /* Basic usage:
* *
* require("./eejs").require("./examples/foo.ejs") * require("./index").require("./examples/foo.ejs")
*/ */
var ejs = require("ejs"); var ejs = require("ejs");
var fs = require("fs"); var fs = require("fs");
var path = require("path"); var path = require("path");
var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks.js");
exports.info = { exports.info = {
buf_stack: [], buf_stack: [],
@ -62,17 +63,26 @@ exports.begin_define_block = function (name) {
exports.begin_capture(); exports.begin_capture();
} }
exports.super = function () {
exports.info.buf.push('<!eejs!super!>');
}
exports.end_define_block = function () { exports.end_define_block = function () {
content = exports.end_capture(); content = exports.end_capture();
var name = exports.info.block_stack.pop(); var name = exports.info.block_stack.pop();
if (typeof exports.info.blocks[name].content == "undefined") if (typeof exports.info.blocks[name].content == "undefined")
exports.info.blocks[name].content = content; exports.info.blocks[name].content = content;
else if (typeof exports.info.blocks[name].content.indexOf('<!eejs!super!>'))
exports.info.blocks[name].content = exports.info.blocks[name].content.replace('<!eejs!super!>', content);
return exports.info.blocks[name].content; return exports.info.blocks[name].content;
} }
exports.end_block = function () { exports.end_block = function () {
var res = exports.end_define_block(); var name = exports.info.block_stack[exports.info.block_stack.length-1];
exports.info.buf.push(res); var args = {content: exports.end_define_block()};
hooks.callAll("eejsBlock_" + name, args);
exports.info.buf.push(args.content);
} }
exports.begin_block = exports.begin_define_block; exports.begin_block = exports.begin_define_block;

110
src/templates/pad.html
View file

@ -15,61 +15,65 @@
<div id="editbar"> <div id="editbar">
<ul id="menu_left"> <ul id="menu_left">
<li id="bold" onClick="window.pad&amp;&amp;pad.editbarClick('bold');return false"> <% e.begin_block("editbarMenuLeft"); %>
<a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a> <li id="bold" onClick="window.pad&amp;&amp;pad.editbarClick('bold');return false">
</li> <a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a>
<li id="italic" onClick="window.pad&amp;&amp;pad.editbarClick('italic'); return false;"> </li>
<a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a> <li id="italic" onClick="window.pad&amp;&amp;pad.editbarClick('italic'); return false;">
</li> <a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a>
<li id="underline" onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" > </li>
<a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a> <li id="underline" onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" >
</li> <a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a>
<li id="strikethrough" onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;"> </li>
<a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a> <li id="strikethrough" onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;">
</li> <a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a>
<li class="separator"></li> </li>
<li id="oderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertorderedlist');return false;"> <li class="separator"></li>
<a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a> <li id="oderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertorderedlist');return false;">
</li> <a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a>
<li id="unoderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertunorderedlist');return false;"> </li>
<a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a> <li id="unoderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertunorderedlist');return false;">
</li> <a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a>
<li id="indent" onClick="window.pad&amp;&amp;pad.editbarClick('indent');return false;"> </li>
<a class="buttonicon buttonicon-indent" title="Indent"></a> <li id="indent" onClick="window.pad&amp;&amp;pad.editbarClick('indent');return false;">
</li> <a class="buttonicon buttonicon-indent" title="Indent"></a>
<li id="outdent" onClick="window.pad&amp;&amp;pad.editbarClick('outdent');return false;"> </li>
<a class="buttonicon buttonicon-outdent" title="Unindent"></a> <li id="outdent" onClick="window.pad&amp;&amp;pad.editbarClick('outdent');return false;">
</li> <a class="buttonicon buttonicon-outdent" title="Unindent"></a>
<li class="separator"></li> </li>
<li id="undo" onClick="window.pad&amp;&amp;pad.editbarClick('undo');return false;"> <li class="separator"></li>
<a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a> <li id="undo" onClick="window.pad&amp;&amp;pad.editbarClick('undo');return false;">
</li> <a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a>
<li id="redo" onClick="window.pad&amp;&amp;pad.editbarClick('redo');return false;"> </li>
<a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a> <li id="redo" onClick="window.pad&amp;&amp;pad.editbarClick('redo');return false;">
</li> <a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a>
<li class="separator"></li> </li>
<li id="clearAuthorship" onClick="window.pad&amp;&amp;pad.editbarClick('clearauthorship');return false;"> <li class="separator"></li>
<a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a> <li id="clearAuthorship" onClick="window.pad&amp;&amp;pad.editbarClick('clearauthorship');return false;">
</li> <a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a>
</li>
<% e.end_block(); %>
</ul> </ul>
<ul id="menu_right"> <ul id="menu_right">
<li id="settingslink" onClick="window.pad&amp;&amp;pad.editbarClick('settings');return false;"> <% e.begin_block("editbarMenuRight"); %>
<a class="buttonicon buttonicon-settings" id="settingslink" title="Settings of this pad"></a> <li id="settingslink" onClick="window.pad&amp;&amp;pad.editbarClick('settings');return false;">
</li> <a class="buttonicon buttonicon-settings" id="settingslink" title="Settings of this pad"></a>
<li id="importexportlink" onClick="window.pad&amp;&amp;pad.editbarClick('import_export');return false;"> </li>
<a class="buttonicon buttonicon-import_export" id="exportlink" title="Import/Export from/to different document formats"></a> <li id="importexportlink" onClick="window.pad&amp;&amp;pad.editbarClick('import_export');return false;">
</li> <a class="buttonicon buttonicon-import_export" id="exportlink" title="Import/Export from/to different document formats"></a>
<li id="embedlink" onClick="window.pad&amp;&amp;pad.editbarClick('embed');return false;" > </li>
<a class="buttonicon buttonicon-embed" id="embedlink" title="Share and Embed this pad"></a> <li id="embedlink" onClick="window.pad&amp;&amp;pad.editbarClick('embed');return false;" >
</li> <a class="buttonicon buttonicon-embed" id="embedlink" title="Share and Embed this pad"></a>
<li class="separator"></li> </li>
<li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'"> <li class="separator"></li>
<a class="buttonicon buttonicon-history" title="Show the history of this pad"></a> <li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'">
</li> <a class="buttonicon buttonicon-history" title="Show the history of this pad"></a>
<li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" title="Show connected users"> </li>
<span class="buttonicon buttonicon-showusers" id="usericonback"></span> <li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" title="Show connected users">
<span id="online_count">1</span> <span class="buttonicon buttonicon-showusers" id="usericonback"></span>
</li> <span id="online_count">1</span>
</li>
<% e.end_block(); %>
</ul> </ul>
</div> </div>