Skip to content

Add option to pass socketio instead of relying solely on the preset glob... #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maritz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add option to pass socketio instead of relying solely on the preset glob... #25

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e58c377
Add option to pass socketio instead of relying solely on the preset g…
Dec 18, 2014
b48544b
Merge branch 'master' into client-custom-socket.io
Sep 28, 2015
d748501
Add module.exports to client so that the client code can be used in c…
Sep 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions client/garageserver.io.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ var GarageServerIO = (function (socketio) {

"use strict";

if (!socketio) {
throw new Error("GarageServer.IO: Socket.IO not found. Please ensure socket.io.js is referenced before the garageserver.io.js file.");
}

function StateController() {
this.clientTime = 0;
this.renderTime = 0;
Expand Down Expand Up @@ -188,6 +184,12 @@ var GarageServerIO = (function (socketio) {

initializeGarageServer = function (path, options) {
_options = options;
if (options.socketio) {
_io = options.socketio;
}
if (!_io) {
throw new Error('GarageServer.IO Socket.IO not found. Please ensure socket.io.js is referenced before the garageserver.io.js file.');
}
if(path == null || path.length <= 0) {
throw new Error('GarageServer.IO client is missing the server path - please verify the path argument passed to GarageServerIO.initializeGarageServer.');
}
Expand Down Expand Up @@ -491,4 +493,8 @@ var GarageServerIO = (function (socketio) {
sendServerEvent: sendServerEvent
};

}) (window.io);
}) (window.io);

if (module) {
module.exports = GarageServerIO;
}