Skip to content
Open
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
9 changes: 9 additions & 0 deletions assets/zone.js
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,15 @@ function patchClass(className) {
return this._o.observe.apply(this._o, arguments);
};

global[className].prototype.takeRecords = function () {
if (!this._active) {
this._creationZone.enqueueTask();
this._active = true;
}
return this._o.takeRecords.apply(this._o, arguments);
};


var prop;
for (prop in instance) {
(function (prop) {
Expand Down
18 changes: 9 additions & 9 deletions package.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ Package.describe({
git: "https://github.com/meteorhacks/zones.git"
});

Package.on_use(function (api) {
Package.onUse(function (api) {
addPackageFiles(api);
api.export('Zones', 'server');
});

Package.on_test(function (api) {
Package.onTest(function (api) {
addPackageFiles(api);

api.use([
'tinytest',
'test-helpers',
], 'client');

api.add_files([
api.addFiles([
'tests/_both.js'
], ['client', 'server']);

api.add_files([
api.addFiles([
'tests/_server.js'
], 'server');

api.add_files([
api.addFiles([
'tests/loader.js',
'tests/reporters.js',
'tests/hijacks/methods.js',
Expand All @@ -46,18 +46,18 @@ function addPackageFiles(api) {
api.use('inject-initial');
}

api.add_files([
api.addAssets([
'assets/utils.js',
'assets/before.js',
'assets/zone.js',
'assets/after.js',
'assets/reporters.js',
'assets/tracer.js',
], 'client', {isAsset: true});
], 'client');

api.add_files(['server/inject.js'], 'server');
api.addFiles(['server/inject.js'], 'server');

api.add_files([
api.addFiles([
'client/hijack.js'
], 'client');

Expand Down
10 changes: 8 additions & 2 deletions server/inject.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,15 @@ var fileList = [

var cacheAvoider = (new Date).getTime();
var finalHtml = '';

var prefixURL = "";
if (process.env.CDN_URL) {
prefixURL = process.env.CDN_URL;
}

fileList.forEach(function(file) {
var template = '<script type="text/javascript" src="/packages/%s/assets/%s?%s"></script>\n';
finalHtml += format(template, packageName, file, cacheAvoider);
var template = '<script type="text/javascript" src="%s/packages/%s/assets/%s?%s"></script>\n';
finalHtml += format(template, prefixURL, packageName, file, cacheAvoider);
});

Zones = {
Expand Down