From 5436b667ff5b3ede524cae9a3d3006986680ab60 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 22 Aug 2014 04:33:58 -0400 Subject: [PATCH] feature(main) rm CloudFunc --- lib/server/main.js | 2 +- lib/server/rest.js | 2 +- lib/server/rest/fs/put.js | 10 ++++++---- lib/server/terminal.js | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/server/main.js b/lib/server/main.js index c0bc93aa..fc84301b 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -56,7 +56,7 @@ global.cloudcmd.main = exports; /* Additional Modules */ - exports.cloudfunc = CloudFunc = librequire('cloudfunc'), + CloudFunc = librequire('cloudfunc'), exports.socket = srvrequire('socket'), exports.auth = srvrequire('auth').auth, diffPatch = librequire('diff/diff-match-patch').diff_match_patch, diff --git a/lib/server/rest.js b/lib/server/rest.js index ab2a89ba..2694ebc6 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -23,7 +23,7 @@ crypto = require('crypto'), Util = require(DIR_LIB + 'util'), - CloudFunc = main.cloudfunc, + CloudFunc = require(DIR_LIB + 'cloudfunc'), onFSGet = main.srvrequire('rest/fs/get').onGet, onFSPut = main.srvrequire('rest/fs/put').onPut, diff --git a/lib/server/rest/fs/put.js b/lib/server/rest/fs/put.js index d2cfbf18..8a58c3d4 100644 --- a/lib/server/rest/fs/put.js +++ b/lib/server/rest/fs/put.js @@ -2,13 +2,15 @@ 'use strict'; var main = global.cloudcmd.main, - path = require('path'), - fs = require('fs'), - diff = main.diff, - CloudFunc = main.cloudfunc, + DIR = '../../../', DIR_SERVER = DIR + 'server/', + path = require('path'), + fs = require('fs'), + diff = main.diff, + + CloudFunc = require(DIR + 'cloudfunc'), Util = require(DIR + 'util'), flop = require(DIR_SERVER + 'flop'), diff --git a/lib/server/terminal.js b/lib/server/terminal.js index f9f46c94..a6069ad9 100644 --- a/lib/server/terminal.js +++ b/lib/server/terminal.js @@ -9,7 +9,7 @@ pty = main.require('pty.js'), Util = require(DIR_LIB + 'util'), - CloudFunc = main.cloudfunc, + CloudFunc = require(DIR_LIB + 'cloudfunc'), Clients = [],