| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 Eyeo GmbH |
| 4 * | 4 * |
| 5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
| 6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
| 7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
| 8 * | 8 * |
| 9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 | 376 |
| 377 return obj; | 377 return obj; |
| 378 } | 378 } |
| 379 }; | 379 }; |
| 380 | 380 |
| 381 ext.backgroundPage = { | 381 ext.backgroundPage = { |
| 382 sendMessage: function(message, responseCallback) | 382 sendMessage: function(message, responseCallback) |
| 383 { | 383 { |
| 384 messageProxy.sendMessage(message, responseCallback, documentInfo); | 384 messageProxy.sendMessage(message, responseCallback, documentInfo); |
| 385 }, | 385 }, |
| 386 sendMessageSync: function(message) |
| 387 { |
| 388 return safari.self.tab.canLoad( |
| 389 beforeLoadEvent, |
| 390 { |
| 391 category: "request", |
| 392 pageId: documentInfo.pageId, |
| 393 frameId: documentInfo.frameId, |
| 394 payload: message |
| 395 } |
| 396 ); |
| 397 }, |
| 386 getWindow: function() | 398 getWindow: function() |
| 387 { | 399 { |
| 388 return backgroundPageProxy.getObject(0); | 400 return backgroundPageProxy.getObject(0); |
| 389 } | 401 } |
| 390 }; | 402 }; |
| 391 | 403 |
| 392 | 404 |
| 393 /* Message processing */ | 405 /* Message processing */ |
| 394 | 406 |
| 395 var messageProxy = new ext._MessageProxy(safari.self.tab); | 407 var messageProxy = new ext._MessageProxy(safari.self.tab); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 412 messageProxy.handleResponse(event.message); | 424 messageProxy.handleResponse(event.message); |
| 413 break; | 425 break; |
| 414 case "proxyCallback": | 426 case "proxyCallback": |
| 415 backgroundPageProxy.handleCallback(event.message); | 427 backgroundPageProxy.handleCallback(event.message); |
| 416 break; | 428 break; |
| 417 } | 429 } |
| 418 } | 430 } |
| 419 } | 431 } |
| 420 }); | 432 }); |
| 421 })(); | 433 })(); |
| OLD | NEW |