Merge branch 'release/2.0.3'

DockYard · Dec 4, 2015 · 3c0e348 · 3c0e348
2 parents b4115db + bc27679
commit 3c0e348
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/addon/mixins/in-viewport.js b/addon/mixins/in-viewport.js
@@ -134,7 +134,9 @@ export default Mixin.create({
       triggeredEventName = 'didExitViewport';
     }
 
-    set(this, 'viewportEntered', hasEnteredViewport);
+    if (get(this, 'viewportSpy') || !viewportEntered) {
+      set(this, 'viewportEntered', hasEnteredViewport);
+    }
 
     this.trigger(triggeredEventName);
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-in-viewport",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Detect if an Ember View or Component is in the viewport @ 60FPS",
   "directories": {
     "doc": "doc",