public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #822 from marcelklehr/fix-windows-install 

Fix windows install
pull/824/merge
John McLear 2012-06-28 07:16:11 -07:00
parent 711dee8f6b c0ee0d8430
commit f891534258
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bin/installOnWindows.bat Normal file
View File

@ -0,0 +1,35 @@
@echo off
set NODE_VERSION=0.6.5
set JQUERY_VERSION=1.7
:: change directory to etherpad-lite root
cd bin
cd ..
echo _
echo Setting up settings.json...
copy settings.json.template_windows settings.json
echo _
echo Updating node...
curl -lo bin\node.exe http://nodejs.org/dist/v%NODE_VERSION%/node.exe
echo _
echo Installing etherpad-lite and dependencies...
cmd /C npm install src/
echo _
echo Updating jquery...
curl -lo "node_modules\ep_etherpad-lite\static\js\jquery.min.js" "http://code.jquery.com/jquery-%JQUERY_VERSION%.min.js"
echo _
echo Some other stuff...
copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\index.template
copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\pad.template
copy node_modules\ep_etherpad-lite\static\custom\js.template node_modules\ep_etherpad-lite\static\custom\timeslider.template
copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\index.template
copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\pad.template
copy node_modules\ep_etherpad-lite\static\custom\css.template node_modules\ep_etherpad-lite\static\custom\timeslider.template
echo _
echo Installed Etherpad-lite!

18
src/static/js/pluginfw/plugins.js
View File

@ -54,10 +54,22 @@ exports.formatHooks = function (hook_set_name) {
};
exports.loadFn = function (path, hookName) {
var x = path.split(":");
var fn = require(x[0]);
var functionName = x[1] ? x[1] : hookName;
var functionName
, parts = path.split(":");
// on windows
if(process.platform == 'win32') {
if(parts.length == 3)
functionName = parts.pop();
path = parts.join(":");
}else{
path = parts[0];
functionName = parts[1];
}
var fn = require(path);
functionName = functionName ? functionName : hookName;
_.each(functionName.split("."), function (name) {
fn = fn[name];
});