Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2.3.0 #56

Merged
merged 9 commits into from
Mar 16, 2015
Merged

Release/2.3.0 #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41394ce
Add ability to specify options as data attributes, close #51
i-like-robots Oct 30, 2014
73d492b
added onMove callback in options
spescina Oct 20, 2014
7184abd
Add thumbnails example
i-like-robots Nov 5, 2014
a5067b1
Use $.noop as default callbacks, refactor a little
i-like-robots Feb 19, 2015
e2d3a31
Remove BOM from CSS files, fixes #63
i-like-robots Feb 19, 2015
257b122
Refactor event handlers to methods on the prototype
i-like-robots Feb 19, 2015
eff1513
Only prevent clicks on zoom image link
i-like-robots Mar 9, 2015
f611723
Update JSHint rules and abide by them
i-like-robots Mar 16, 2015
3338738
Bump version no.
i-like-robots Mar 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor event handlers to methods on the prototype
  • Loading branch information
@i-like-robots
i-like-robots committed Feb 19, 2015
commit 257b122fae635f5174ff0da7b78e8135539feb14
129 changes: 82 additions & 47 deletions src/easyzoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,33 +47,16 @@
* @private
*/
EasyZoom.prototype._init = function() {
var self = this;

this.$link = this.$target.find('a');
this.$image = this.$target.find('img');

this.$flyout = $('<div class="easyzoom-flyout" />');
this.$notice = $('<div class="easyzoom-notice" />');

this.$target
.on('mouseenter.easyzoom touchstart.easyzoom', function(e) {
self.isMouseOver = true;

if (e.originalEvent.touches && e.originalEvent.touches.length > 1) return;

e.preventDefault();
self.show(e, true);
})
.on('mousemove.easyzoom touchmove.easyzoom', function(e) {
if (!self.isOpen) return;

e.preventDefault();
self._move(e);
})
.on('mouseleave.easyzoom touchend.easyzoom', function() {
self.isMouseOver = false;
self.isOpen && self.hide();
});
.on('mousemove.easyzoom touchmove.easyzoom', $.proxy(this._onMove, this))
.on('mouseleave.easyzoom touchend.easyzoom', $.proxy(this._onLeave, this))
.on('mouseenter.easyzoom touchstart.easyzoom', $.proxy(this._onEnter, this));

if (this.opts.preventClicks) {
this.$target.on('click.easyzoom', 'a', function(e) {
Expand All @@ -92,7 +75,7 @@
var self = this;

if (!this.isReady) {
return this._load(this.$link.attr('href'), function() {
return this._loadImage(this.$link.attr('href'), function() {
if (self.isMouseOver || !testMouseOver) {
self.show(e);
}
Expand Down Expand Up @@ -121,43 +104,93 @@
};

/**
* Load
* On enter
* @private
* @param {String} href
* @param {Function} callback
* @param {Event} e
*/
EasyZoom.prototype._load = function(href, callback) {
var zoom = new Image();
EasyZoom.prototype._onEnter = function(e) {
var touches = e.originalEvent.touches;

this.isMouseOver = true;

if (touches && touches.length == 1) {
e.preventDefault();
this.show(e, true);
}
};

/**
* On move
* @private
* @param {Event} e
*/
EasyZoom.prototype._onMove = function(e) {
if (!this.isOpen) return;

e.preventDefault();
this._move(e);
};

this.$target.addClass('is-loading').append(this.$notice.text(this.opts.loadingNotice));
/**
* On leave
* @private
* @param {Event} e
*/
EasyZoom.prototype._onLeave = function(e) {
this.isMouseOver = false;
this.isOpen && this.hide();
};

/**
* On load
* @private
* @param {Event} e
*/
EasyZoom.prototype._onLoad = function(e) {
// IE may fire a load event even on error so test the image dimensions
if (!e.target.width) return;

this.$zoom = $(zoom);
this.isReady = true;

zoom.onerror = $.proxy(function() {
var self = this;
this.$notice.detach();
this.$flyout.html(this.$zoom);
this.$target.removeClass('is-loading').addClass('is-ready');

this.$notice.text(this.opts.errorNotice);
this.$target.removeClass('is-loading').addClass('is-error');
e.data.call && e.data();
};

this.detachNotice = setTimeout(function() {
self.$notice.detach();
self.detachNotice = null;
}, this.opts.errorDuration);
}, this);
/**
* On error
* @private
*/
EasyZoom.prototype._onError = function() {
var self = this;

zoom.onload = $.proxy(function() {
this.$notice.text(this.opts.errorNotice);
this.$target.removeClass('is-loading').addClass('is-error');

// IE may fire a load event even on error so check the image has dimensions
if (!zoom.width) return;
this.detachNotice = setTimeout(function() {
self.$notice.detach();
self.detachNotice = null;
}, this.opts.errorDuration);
};

this.isReady = true;
/**
* Load image
* @private
* @param {String} href
* @param {Function} callback
*/
EasyZoom.prototype._loadImage = function(href, callback) {
var zoom = new Image();

this.$notice.detach();
this.$flyout.html(this.$zoom);
this.$target.removeClass('is-loading').addClass('is-ready');
this.$target
.addClass('is-loading')
.append(this.$notice.text(this.opts.loadingNotice));

callback();
}, this);
this.$zoom = $(zoom)
.on('error', $.proxy(this._onError, this))
.on('load', callback, $.proxy(this._onLoad, this));

zoom.style.position = 'absolute';
zoom.src = href;
Expand Down Expand Up @@ -246,7 +279,9 @@
EasyZoom.prototype.teardown = function() {
this.hide();

this.$target.removeClass('is-loading is-ready is-error').off('.easyzoom');
this.$target
.off('.easyzoom')
.removeClass('is-loading is-ready is-error');

this.detachNotice && clearTimeout(this.detachNotice);

Expand Down
8 changes: 4 additions & 4 deletions test/spec/easyzoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@

module("Internals", lifecycle);

asyncTest("._load(path, callback)", function() {
asyncTest("._loadImage(path, callback)", function() {

expect(5);

api._load(api.$link.attr("href"), function() {
api._loadImage(api.$link.attr("href"), function() {

equal(api.isReady, true, "Ready flag set to true");
equal(api.$notice.parent().length, 0, "Loading notice detached from DOM");
Expand All @@ -192,12 +192,12 @@

});

asyncTest("._load(404)", function() {
asyncTest("._loadImage(404)", function() {

expect(3);

api.opts.errorDuration = 100;
api._load("404.jpg");
api._loadImage("404.jpg");

api.$zoom.on("error", function() {

Expand Down