Bug 1108099 - Make formatValue wait for Context.isReady. r=gandalf

l20n · Dec 6, 2014 · faee3c8 · faee3c8
1 parent 90c20bc
commit faee3c8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/l20n/context.js b/lib/l20n/context.js
@@ -21,6 +21,7 @@ function Context(id) {
   this.locales = {};
 
   this._emitter = new EventEmitter();
+  this._ready = new Promise(this.once.bind(this));
 }
 
 
@@ -92,7 +93,7 @@ function formatEntity(args, entity) {
 }
 
 function formatAsync(fn, id, args) {
-  return Promise.resolve().then(
+  return this._ready.then(
     getWithFallback.bind(this, id)).then(
       fn.bind(this, args),
       reportMissing.bind(this, id));