diff --git a/lib/server/main.js b/lib/server/main.js index 2c188306..9e79e210 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -59,8 +59,6 @@ CloudFunc = librequire('cloudfunc'), exports.socket = srvrequire('socket'), exports.auth = srvrequire('auth').auth, - diffPatch = librequire('diff/diff-match-patch').diff_match_patch, - exports.diff = new (librequire('diff').DiffProto)(diffPatch); /* second initializing after all modules load, so global var is * * totally filled of all information that should know all modules */ diff --git a/lib/server/rest/fs/put.js b/lib/server/rest/fs/put.js index 8a58c3d4..b2dea674 100644 --- a/lib/server/rest/fs/put.js +++ b/lib/server/rest/fs/put.js @@ -1,21 +1,21 @@ (function() { 'use strict'; - var main = global.cloudcmd.main, - - DIR = '../../../', + var 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'), pack = require(DIR_SERVER + 'pack'), - pipe = require(DIR_SERVER + 'pipe'); + pipe = require(DIR_SERVER + 'pipe'), + + diffPatch = require(DIR + 'diff/diff-match-patch').diff_match_patch, + diff = new (require(DIR + 'diff').DiffProto)(diffPatch); exports.onPut = onPut;