Skip to content
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.

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

Fix "Failed to parse" bug #84

Merged
merged 1 commit into from
Mar 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions sharejs-base/loadBCSocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

//This is required to load BCSocket into the global scope for sharejs
//http://stackoverflow.com/questions/31197220/can-i-use-an-es6-2015-module-import-to-set-a-reference-in-global-scope
import {BCSocket as bc} from 'share/node_modules/browserchannel/dist/bcsocket-uncompressed'
window.BCSocket = bc;
import {BCSocket as bc} from 'browserchannel/dist/bcsocket-uncompressed'
window.BCSocket = bc;
3 changes: 2 additions & 1 deletion sharejs-base/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Package.describe({
Npm.depends({
// Fork of 0.6.3 that doesn't require("mongodb"):
// https://github.com/meteor/meteor/issues/532#issuecomment-82635979
share: "https://github.com/mizzao/ShareJS/tarball/05b625ea1e7f7f27bd13ba7ed05102b38dd175e5"
// Includes "Failed to parse" bugfix
share: "https://github.com/qeek/sharejs-tmp-fork/tarball/94c059bd4da24de8e6e90fb83484dd9c7b0efd59"
});

Package.onUse(function (api) {
Expand Down