fix destroy method (#32)

callmecavs · Jul 16, 2015 · 5266f94 · 5266f94
1 parent 68e9d86
commit 5266f94
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name":        "layzr.js",
-  "version":     "1.4.2",
+  "version":     "1.4.3",
   "description": "A small, fast, modern, and dependency-free library for lazy loading.",
   "homepage":    "http://callmecavs.github.io/layzr.js/",
   "main":        ["dist/layzr.js"],

diff --git a/dist/layzr.js b/dist/layzr.js
@@ -41,6 +41,9 @@ function Layzr(options) {
   // nodelist
   this._nodes = document.querySelectorAll(this._optionsSelector);
 
+  // scroll and resize handler
+  this._handlerBind = this._requestScroll.bind(this);
+
   // call to create
   this._create();
 }
@@ -84,19 +87,17 @@ Layzr.prototype._getContainerHeight = function() {
 
 Layzr.prototype._create = function() {
   // fire scroll event once
-  this._requestScroll();
+  this._handlerBind();
 
   // bind scroll and resize event
-  this._optionsContainer.addEventListener('scroll', this._requestScroll.bind(this), false);
-  this._optionsContainer.addEventListener('resize', this._requestScroll.bind(this), false);
+  this._optionsContainer.addEventListener('scroll', this._handlerBind, false);
+  this._optionsContainer.addEventListener('resize', this._handlerBind, false);
 };
 
 Layzr.prototype._destroy = function() {
-  // possibly remove attributes, and set all sources?
-
   // unbind scroll and resize event
-  this._optionsContainer.removeEventListener('scroll', this._requestScroll.bind(this), false);
-  this._optionsContainer.removeEventListener('resize', this._requestScroll.bind(this), false);
+  this._optionsContainer.removeEventListener('scroll', this._handlerBind, false);
+  this._optionsContainer.removeEventListener('resize', this._handlerBind, false);
 };
 
 Layzr.prototype._inViewport = function(node) {

diff --git a/dist/layzr.min.js b/dist/layzr.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name":        "layzr.js",
-  "version":     "1.4.2",
+  "version":     "1.4.3",
   "description": "A small, fast, modern, and dependency-free library for lazy loading.",
   "homepage":    "http://callmecavs.github.io/layzr.js/",
   "main":        "dist/layzr.js",

diff --git a/src/layzr.js b/src/layzr.js
@@ -26,6 +26,9 @@ function Layzr(options) {
   // nodelist
   this._nodes = document.querySelectorAll(this._optionsSelector);
 
+  // scroll and resize handler
+  this._handlerBind = this._requestScroll.bind(this);
+
   // call to create
   this._create();
 }
@@ -69,19 +72,17 @@ Layzr.prototype._getContainerHeight = function() {
 
 Layzr.prototype._create = function() {
   // fire scroll event once
-  this._requestScroll();
+  this._handlerBind();
 
   // bind scroll and resize event
-  this._optionsContainer.addEventListener('scroll', this._requestScroll.bind(this), false);
-  this._optionsContainer.addEventListener('resize', this._requestScroll.bind(this), false);
+  this._optionsContainer.addEventListener('scroll', this._handlerBind, false);
+  this._optionsContainer.addEventListener('resize', this._handlerBind, false);
 };
 
 Layzr.prototype._destroy = function() {
-  // possibly remove attributes, and set all sources?
-
   // unbind scroll and resize event
-  this._optionsContainer.removeEventListener('scroll', this._requestScroll.bind(this), false);
-  this._optionsContainer.removeEventListener('resize', this._requestScroll.bind(this), false);
+  this._optionsContainer.removeEventListener('scroll', this._handlerBind, false);
+  this._optionsContainer.removeEventListener('resize', this._handlerBind, false);
 };
 
 Layzr.prototype._inViewport = function(node) {