Skip to content

Make client compatible with AMD loaders. Issue #338 #453

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

Merged
rauchg merged 2 commits into from
Sep 9, 2012
Merged

Make client compatible with AMD loaders. Issue #338 #453

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85df087
Make client compatible with AMD loaders. Issue #338.
sfilatov Jul 27, 2012
f5d55ba
Make client compatible with AMD loaders. Issue #338.
sfilatov Jul 27, 2012
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
12 changes: 9 additions & 3 deletions bin/builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,16 @@ var baseTransports = {

/**
* Wrappers for client-side usage.
* This enables usage in both top-level browser window and client-side CommonJS systems.
* This enables usage in top-level browser window, client-side CommonJS systems and AMD loaders.
* If doing a node build for server-side client, this wrapper is NOT included.
* @api private
*/
var wrapperPre = "\nvar io = ('undefined' === typeof module ? {} : module.exports);\n(function() {\n";
var wrapperPost = "\n})();";

var wrapperPost = "\nif (typeof define === \"function\" && define.amd) {" +
"\n define([], function () { return io; });" +
"\n}\n})();";


/**
* Builds a custom Socket.IO distribution based on the transports that you
Expand Down Expand Up @@ -197,7 +201,9 @@ var builder = module.exports = function () {
}

// post-wrapper for non-server-side builds
if (!settings.node)code += wrapperPost;
if (!settings.node) {
code += wrapperPost;
}

code = activeXObfuscator(code);

Expand Down