Move Future.ret alias to fiber_helpers.

meteor · Nov 10, 2012 · 4f952da · 4f952da
1 parent a87c658
commit 4f952da
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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;