Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: chrome/ext/common.js

Issue 5088751004942336: Issue 370 - Right-clicked element is removed independent of created filter (Closed)
Patch Set: Rebase to rev 3c9cea80c481 Created July 18, 2014, 8:54 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/ext/background.js ('k') | chrome/ext/content.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/ext/common.js
===================================================================
rename from chrome/common.js
rename to chrome/ext/common.js
--- a/chrome/common.js
+++ b/chrome/ext/common.js
@@ -1,6 +1,6 @@
/*
* This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2013 Eyeo GmbH
+ * Copyright (C) 2006-2014 Eyeo GmbH
*
* Adblock Plus is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3 as
@@ -17,85 +17,24 @@
(function()
{
- /* Events */
+ /* Message passing */
- WrappedEventTarget = function(target)
- {
- this._listeners = [];
- this._wrappedListeners = [];
- this._target = target;
- };
- WrappedEventTarget.prototype = {
- _prepareExtraArguments: function()
+ ext.onMessage = new ext._EventTarget();
+
+
+ /* Background page */
+
+ ext.backgroundPage = {
+ sendMessage: chrome.runtime.sendMessage,
+ getWindow: function()
{
- return [];
- },
- addListener: function(listener)
- {
- var extraArgs = Array.prototype.slice.call(arguments, 1);
- extraArgs = this._prepareExtraArguments.apply(this, extraArgs);
-
- var wrappedListener = this._wrapListener(listener);
- this._listeners.push(listener);
- this._wrappedListeners.push(wrappedListener);
-
- this._target.addListener.apply(this._target, [wrappedListener].concat(extraArgs));
- },
- removeListener: function(listener)
- {
- var idx = this._listeners.indexOf(listener);
-
- if (idx != -1) {
- this._target.removeListener(this._wrappedListeners[idx]);
-
- this._listeners.splice(idx, 1);
- this._wrappedListeners.splice(idx, 1);
- }
+ return chrome.extension.getBackgroundPage();
}
};
- var MessageEventTarget = function()
- {
- var target;
- if ("runtime" in chrome && "onMessage" in chrome.runtime)
- target = chrome.runtime.onMessage;
- else if ("onMessage" in chrome.extension)
- target = chrome.extension.onMessage;
- else
- target = chrome.extension.onRequest;
- WrappedEventTarget.call(this, target);
- };
- MessageEventTarget.prototype = {
- __proto__: WrappedEventTarget.prototype,
- _wrapListener: function(listener) {
- return function(message, sender, sendResponse)
- {
- if (sender.tab && sender.tab.id >= 0)
- sender.tab = new Tab(sender.tab);
- return listener(message, sender, sendResponse);
- };
- }
- };
+ /* Utils */
- /* API */
-
- ext = {
- backgroundPage: {
- getWindow: function()
- {
- return chrome.extension.getBackgroundPage();
- }
- },
- getURL: chrome.extension.getURL,
- onMessage: new MessageEventTarget(),
- i18n: chrome.i18n
- };
-
- if ("runtime" in chrome && "sendMessage" in chrome.runtime)
- ext.backgroundPage.sendMessage = chrome.runtime.sendMessage;
- else if ("sendMessage" in chrome.extension)
- ext.backgroundPage.sendMessage = chrome.extension.sendMessage;
- else
- ext.backgroundPage.sendMessage = chrome.extension.sendRequest;
+ ext.getURL = chrome.extension.getURL;
+ ext.i18n = chrome.i18n;
})();
« no previous file with comments | « chrome/ext/background.js ('k') | chrome/ext/content.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld