Replace Ember.RunLoop with Backburner.js

emberjs · May 10, 2013 · a8b6e30 · a8b6e30
1 parent 9d5d5dc
commit a8b6e30
Show file tree

Hide file tree

Showing 12 changed files with 516 additions and 397 deletions.
diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
@@ -463,7 +463,7 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin
   },
 
   reset: function() {
-    Ember.assert('App#reset no longer needs to be wrapped in a run-loop', !Ember.run.currentRunLoop);
+    Ember.assert('App#reset no longer needs to be wrapped in a run-loop', !Ember.run.backburner.currentInstance);
     Ember.run(this, function(){
       Ember.run(this.__container__, 'destroy');
 

diff --git a/packages/ember-metal/lib/main.js b/packages/ember-metal/lib/main.js
@@ -24,4 +24,4 @@ require('ember-metal/events');
 require('ember-metal/observer');
 require('ember-metal/mixin');
 require('ember-metal/binding');
-require('ember-metal/run_loop');
+require('ember-metal/run_loop');