Remove all global dependencies from broadcast modules.

This commit is contained in:
Chad Weider 2012-01-26 21:20:26 -08:00
parent cd86ef5600
commit d934fd6107
4 changed files with 17 additions and 10 deletions

View file

@ -20,16 +20,17 @@
* limitations under the License.
*/
var global = this;
var makeCSSManager = require('/cssmanager_client').makeCSSManager;
var domline = require('/domline_client').domline;
var Changeset = require('/easysync2_client').Changeset;
var AttribPool = require('/easysync2_client').AttribPool;
var linestylefilter = require('/linestylefilter_client').linestylefilter;
function loadBroadcastJS()
// These parameters were global, now they are injected. A reference to the
// Timeslider controller would probably be more appropriate.
function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, BroadcastSlider)
{
var changesetLoader = undefined;
// just in case... (todo: this must be somewhere else in the client code.)
// Below Array#map code was direct pasted by AppJet/Etherpad, licence unknown. Possible source: http://www.tutorialspoint.com/javascript/array_map.htm
if (!Array.prototype.map)
@ -423,7 +424,7 @@ function loadBroadcastJS()
}));
}
global.changesetLoader = {
changesetLoader = {
running: false,
resolved: [],
requestQueue1: [],
@ -763,6 +764,8 @@ function loadBroadcastJS()
}
receiveAuthorData(clientVars.historicalAuthorData);
return changesetLoader;
}
exports.loadBroadcastJS = loadBroadcastJS;