Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2683 from vyv03354/bug824601

Browse Source 
Replace getUserData()/setUserData() with CustomEvents
This commit is contained in:
Yury Delendik 2013-02-06 07:16:30 -08:00
commit ef1be8ee33
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
extensions/firefox/components/PdfStreamConverter.js
View File

@ -455,9 +455,9 @@ function RequestListener(actions) {
RequestListener.prototype.receive = function(event) { RequestListener.prototype.receive = function(event) {
var message = event.target; var message = event.target;
var doc = message.ownerDocument; var doc = message.ownerDocument;
var action = message.getUserData('action'); var action = event.detail.action;
var data = message.getUserData('data'); var data = event.detail.data;
var sync = message.getUserData('sync'); var sync = event.detail.sync;
var actions = this.actions; var actions = this.actions;
if (!(action in actions)) { if (!(action in actions)) {
log('Unknown action: ' + action); log('Unknown action: ' + action);
@ -465,25 +465,27 @@ RequestListener.prototype.receive = function(event) {
} }
if (sync) { if (sync) {
var response = actions[action].call(this.actions, data); var response = actions[action].call(this.actions, data);
message.setUserData('response', response, null); var detail = event.detail;
detail.__exposedProps__ = {response: 'r'};
detail.response = response;
} else { } else {
var response; var response;
if (!message.getUserData('callback')) { if (!event.detail.callback) {
doc.documentElement.removeChild(message); doc.documentElement.removeChild(message);
response = null; response = null;
} else { } else {
response = function sendResponse(response) { response = function sendResponse(response) {
try { try {
message.setUserData('response', response, null); var listener = doc.createEvent('CustomEvent');
listener.initCustomEvent('pdf.js.response', true, false,
{response: response,
__exposedProps__: {response: 'r'}});
return message.dispatchEvent(listener);
} catch (e) { } catch (e) {
// message is no longer accessible because the sender is already // doc is no longer accessible because the requestor is already
// gone. the unloaded sender cannot receive the response anyway. // gone. unloaded content cannot receive the response anyway.
return false; return false;
} }
var listener = doc.createEvent('HTMLEvents');
listener.initEvent('pdf.js.response', true, false);
return message.dispatchEvent(listener);
}; };
} }
actions[action].call(this.actions, data, response); actions[action].call(this.actions, data, response);

24
web/firefoxcom.js
View File

@ -28,15 +28,13 @@ var FirefoxCom = (function FirefoxComClosure() {
*/ */
requestSync: function(action, data) { requestSync: function(action, data) {
var request = document.createTextNode(''); var request = document.createTextNode('');
request.setUserData('action', action, null);
request.setUserData('data', data, null);
request.setUserData('sync', true, null);
document.documentElement.appendChild(request); document.documentElement.appendChild(request);
var sender = document.createEvent('Events'); var sender = document.createEvent('CustomEvent');
sender.initEvent('pdf.js.message', true, false); sender.initCustomEvent('pdf.js.message', true, false,
{action: action, data: data, sync: true});
request.dispatchEvent(sender); request.dispatchEvent(sender);
var response = request.getUserData('response'); var response = sender.detail.response;
document.documentElement.removeChild(request); document.documentElement.removeChild(request);
return response; return response;
}, },
@ -50,16 +48,10 @@ var FirefoxCom = (function FirefoxComClosure() {
*/ */
request: function(action, data, callback) { request: function(action, data, callback) {
var request = document.createTextNode(''); var request = document.createTextNode('');
request.setUserData('action', action, null);
request.setUserData('data', data, null);
request.setUserData('sync', false, null);
if (callback) { if (callback) {
request.setUserData('callback', callback, null);
document.addEventListener('pdf.js.response', function listener(event) { document.addEventListener('pdf.js.response', function listener(event) {
var node = event.target, var node = event.target,
callback = node.getUserData('callback'), response = event.detail.response;
response = node.getUserData('response');
document.documentElement.removeChild(node); document.documentElement.removeChild(node);
@ -69,8 +61,10 @@ var FirefoxCom = (function FirefoxComClosure() {
} }
document.documentElement.appendChild(request); document.documentElement.appendChild(request);
var sender = document.createEvent('HTMLEvents'); var sender = document.createEvent('CustomEvent');
sender.initEvent('pdf.js.message', true, false); sender.initCustomEvent('pdf.js.message', true, false,
{action: action, data: data, sync: false,
callback: callback});
return request.dispatchEvent(sender); return request.dispatchEvent(sender);
} }
}; };