From 4f952daba6cc10da75bb8fa9d149dd3d204de806 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Fri, 9 Nov 2012 17:28:47 -0800 Subject: [PATCH] Move Future.ret alias to fiber_helpers. --- packages/meteor/fiber_helpers.js | 11 +++++++++++ packages/mongo-livedata/mongo_driver.js | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/meteor/fiber_helpers.js b/packages/meteor/fiber_helpers.js index 7be3d61292..bcae80e2b6 100644 --- a/packages/meteor/fiber_helpers.js +++ b/packages/meteor/fiber_helpers.js @@ -1,3 +1,9 @@ +(function () { + +var path = __meteor_bootstrap__.require('path'); +var Fiber = __meteor_bootstrap__.require('fibers'); +var Future = __meteor_bootstrap__.require(path.join('fibers', 'future')); + Meteor._noYieldsAllowed = function (f) { // "Fiber" and "yield" are both in the global namespace. The yield function is // at both "yield" and "Fiber.yield". (It's also at require('fibers').yield @@ -14,3 +20,8 @@ Meteor._noYieldsAllowed = function (f) { global.yield = savedYield; } }; + +// js2-mode AST blows up when parsing 'future.return()', so alias. +Future.prototype.ret = Future.prototype.return; + +})(); diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js index 6b8bed2234..efa962d8aa 100644 --- a/packages/mongo-livedata/mongo_driver.js +++ b/packages/mongo-livedata/mongo_driver.js @@ -11,9 +11,6 @@ var path = __meteor_bootstrap__.require('path'); var MongoDB = __meteor_bootstrap__.require('mongodb'); var Future = __meteor_bootstrap__.require(path.join('fibers', 'future')); -// js2-mode AST blows up when parsing 'future.return()', so alias. -Future.prototype.ret = Future.prototype.return; - _Mongo = function (url) { var self = this;