Skip to content

Commit

Permalink
fix bug where send was called sendMessage. Should be send
Browse files Browse the repository at this point in the history
Denote that receiveMessage is private
  • Loading branch information
JetFault committed Apr 22, 2015
1 parent 8884b6b commit 5f58976
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 36 deletions.
36 changes: 18 additions & 18 deletions dist/hermes-messenger.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ function Hermes(frame, origin) {
this.callbacks = {};
this.callbackId = 0;

window.addEventListener('message', this.receiveMessage);
window.addEventListener('message', this._receiveMessage);
}

inherits(Hermes, EventEmitter);

Hermes.prototype.sendMessage = function(data, cb) {
Hermes.prototype.send = function send(data, cb) {
if (this.destroyed) {
throw new Error('Hermes instance already destroyed');
} else if (!this.targetFrame) {
Expand All @@ -38,7 +38,19 @@ Hermes.prototype.sendMessage = function(data, cb) {
this.targetFrame.postMessage(text, this.targetDomain);
};

Hermes.prototype.receiveMessage = function receiveMessage(event) {
Hermes.prototype.announceReady = function announceReady() {
this.send({
type: HERMES_READY
});
};

Hermes.prototype.destroy = function destroy() {
this.destroyed = true;
this.removeAllListeners();
window.removeEventListener('message', this._receiveMessage);
};

Hermes.prototype._receiveMessage = function _receiveMessage(event) {
if (this.targetOrigin !== '*' && event.origin !== this.targetOrigin) {
return;
}
Expand Down Expand Up @@ -79,26 +91,14 @@ Hermes.prototype.receiveMessage = function receiveMessage(event) {
}

// Emit a message and give ability to respond
this.emit('message', json.data, cb);
};

Hermes.prototype.announceReady = function() {
this.sendMessage({
type: HERMES_READY
});
};

Hermes.prototype.destroy = function() {
this.destroyed = true;
this.removeAllListeners();
window.removeEventListener('message', this.receiveMessage);
this.emit('message', json.data, cb, event.source, event.origin);
};

Hermes.prototype._serializeData = function(data) {
Hermes.prototype._serializeData = function _serializeData(data) {
return JSON.stringify(data);
};

Hermes.prototype._serializeCb = function(cb) {
Hermes.prototype._serializeCb = function _serializeCb(cb) {
var id = this.callbackId;
this.callbacks[this.callbackId++] = cb;
return id;
Expand Down
2 changes: 1 addition & 1 deletion dist/hermes-messenger.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 17 additions & 17 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ function Hermes(frame, origin) {
this.callbacks = {};
this.callbackId = 0;

window.addEventListener('message', this.receiveMessage);
window.addEventListener('message', this._receiveMessage);
}

inherits(Hermes, EventEmitter);

Hermes.prototype.sendMessage = function(data, cb) {
Hermes.prototype.send = function send(data, cb) {
if (this.destroyed) {
throw new Error('Hermes instance already destroyed');
} else if (!this.targetFrame) {
Expand All @@ -37,7 +37,19 @@ Hermes.prototype.sendMessage = function(data, cb) {
this.targetFrame.postMessage(text, this.targetDomain);
};

Hermes.prototype.receiveMessage = function receiveMessage(event) {
Hermes.prototype.announceReady = function announceReady() {
this.send({
type: HERMES_READY
});
};

Hermes.prototype.destroy = function destroy() {
this.destroyed = true;
this.removeAllListeners();
window.removeEventListener('message', this._receiveMessage);
};

Hermes.prototype._receiveMessage = function _receiveMessage(event) {
if (this.targetOrigin !== '*' && event.origin !== this.targetOrigin) {
return;
}
Expand Down Expand Up @@ -81,23 +93,11 @@ Hermes.prototype.receiveMessage = function receiveMessage(event) {
this.emit('message', json.data, cb, event.source, event.origin);
};

Hermes.prototype.announceReady = function() {
this.sendMessage({
type: HERMES_READY
});
};

Hermes.prototype.destroy = function() {
this.destroyed = true;
this.removeAllListeners();
window.removeEventListener('message', this.receiveMessage);
};

Hermes.prototype._serializeData = function(data) {
Hermes.prototype._serializeData = function _serializeData(data) {
return JSON.stringify(data);
};

Hermes.prototype._serializeCb = function(cb) {
Hermes.prototype._serializeCb = function _serializeCb(cb) {
var id = this.callbackId;
this.callbacks[this.callbackId++] = cb;
return id;
Expand Down

0 comments on commit 5f58976

Please sign in to comment.