mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 00:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop

Browse source
This commit is contained in:
johnyma22 2012-07-05 17:55:30 +01:00
commit 35bf5d17c0
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/installDeps.sh
View file

@ -35,8 +35,8 @@ fi
#check node version #check node version
NODE_VERSION=$(node --version) NODE_VERSION=$(node --version)
if [ ! $(echo $NODE_VERSION | cut -d "." -f 1-2) = "v0.6" ]; then if [ ! $(echo $NODE_VERSION | cut -d "." -f 1-2) = "v0.8" ]; then
echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.6.x" >&2 echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.8.x" >&2
exit 1 exit 1
fi fi

6
bin/installOnWindows.bat
View file

@ -1,5 +1,5 @@
@echo off @echo off
set NODE_VERSION=0.6.5 set NODE_VERSION=0.8.1
set JQUERY_VERSION=1.7 set JQUERY_VERSION=1.7
:: change directory to etherpad-lite root :: change directory to etherpad-lite root
@ -22,8 +22,8 @@ echo _
echo Copying custom templates... echo Copying custom templates...
set custom_dir=node_modules\ep_etherpad-lite\static\custom set custom_dir=node_modules\ep_etherpad-lite\static\custom
FOR %%f IN (index pad timeslider) DO ( FOR %%f IN (index pad timeslider) DO (
if NOT EXIST %custom_dir%\%%f.js copy %custom_dir%\js.template %custom_dir%\%%f.js if NOT EXIST "%custom_dir%\%%f.js" copy "%custom_dir%\js.template" "%custom_dir%\%%f.js"
if NOT EXIST %custom_dir%\%%f.css copy %custom_dir%\css.template %custom_dir%\%%f.css if NOT EXIST "%custom_dir%\%%f.css" copy "%custom_dir%\css.template" "%custom_dir%\%%f.css"
) )
echo _ echo _

5
src/node/utils/caching_middleware.js
View file

@ -21,9 +21,12 @@ var path = require('path');
var zlib = require('zlib'); var zlib = require('zlib');
var util = require('util'); var util = require('util');
var settings = require('./Settings'); var settings = require('./Settings');
var semver = require('semver');
var existsSync = (semver.satisfies(process.version, '>=0.8.0')) ? fs.existsSync : path.existsSync
var CACHE_DIR = path.normalize(path.join(settings.root, 'var/')); var CACHE_DIR = path.normalize(path.join(settings.root, 'var/'));
CACHE_DIR = path.existsSync(CACHE_DIR) ? CACHE_DIR : undefined; CACHE_DIR = existsSync(CACHE_DIR) ? CACHE_DIR : undefined;
var responseCache = {}; var responseCache = {};

6
src/package.json
View file

@ -16,9 +16,9 @@
"resolve" : "0.2.1", "resolve" : "0.2.1",
"socket.io" : "0.9.6", "socket.io" : "0.9.6",
"ueberDB" : "0.1.7", "ueberDB" : "0.1.7",
"async" : "0.1.18", "async" : "0.1.x",
"express" : "2.5.8", "express" : "2.5.x",
"connect" : "1.8.7", "connect" : "1.x",
"clean-css" : "0.3.2", "clean-css" : "0.3.2",
"uglify-js" : "1.2.5", "uglify-js" : "1.2.5",
"formidable" : "1.0.9", "formidable" : "1.0.9",