Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

this fixes https://github.com/chrisaljoudi/uBlock/issues/1219 for Firefox

This commit is contained in:
gorhill 2015-04-09 07:15:14 -04:00
parent 66a5d34860
commit b9e07a16e3
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/firefox/bootstrap.js vendored
View File

@ -31,7 +31,7 @@
let bgProcess; let bgProcess;
let version; let version;
const hostName = 'ublock'; const hostName = 'ublock0';
const restartListener = { const restartListener = {
get messageManager() { get messageManager() {
return Components.classes['@mozilla.org/parentprocessmessagemanager;1'] return Components.classes['@mozilla.org/parentprocessmessagemanager;1']

2
platform/firefox/chrome.manifest
View File

@ -1 +1 @@
content ublock ./ content ublock0 ./

2
platform/firefox/install.rdf
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/2004/em-rdf#"> <r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/2004/em-rdf#">
<r:Description about="urn:mozilla:install-manifest"> <r:Description about="urn:mozilla:install-manifest">
<id>{{2b10c1c8-a11f-4bad-fe9c-1c11e82cac42}}</id> <id>uBlock0@raymondhill.net</id>
<version>{version}</version> <version>{version}</version>
<name>{name}</name> <name>{name}</name>
<description>{description}</description> <description>{description}</description>

4
platform/firefox/vapi-background.js
View File

@ -44,7 +44,7 @@ vAPI.fennec = Services.appinfo.ID === '{aa3c5121-dab2-40e2-81ca-7ea25febc110}';
/******************************************************************************/ /******************************************************************************/
vAPI.app = { vAPI.app = {
name: 'uBlock', name: 'uBlock₀',
version: location.hash.slice(1) version: location.hash.slice(1)
}; };
@ -1856,7 +1856,7 @@ vAPI.contextMenu.remove = function() {
/******************************************************************************/ /******************************************************************************/
var optionsObserver = { var optionsObserver = {
addonId: '{2b10c1c8-a11f-4bad-fe9c-1c11e82cac42}', addonId: 'uBlock0@raymondhill.net',
register: function() { register: function() {
Services.obs.addObserver(this, 'addon-options-displayed', false); Services.obs.addObserver(this, 'addon-options-displayed', false);

2
platform/firefox/vapi-client.js
View File

@ -160,7 +160,7 @@ vAPI.messaging = {
vAPI.messaging.listeners[message.requestId] = callback; vAPI.messaging.listeners[message.requestId] = callback;
} }
sendAsyncMessage('ublock:background', message); sendAsyncMessage('ublock0:background', message);
}, },
close: function() { close: function() {
delete vAPI.messaging.channels[this.channelName]; delete vAPI.messaging.channels[this.channelName];

4
tools/make-firefox-meta.py
View File

@ -56,13 +56,13 @@ for alpha2 in sorted(os.listdir(source_locale_dir)):
chrome_manifest = pj(build_dir, 'chrome.manifest') chrome_manifest = pj(build_dir, 'chrome.manifest')
with open(chrome_manifest, 'at', encoding='utf-8', newline='\n') as f: with open(chrome_manifest, 'at', encoding='utf-8', newline='\n') as f:
f.write(u'\nlocale ublock en ./locale/en/\n') f.write(u'\nlocale ublock0 en ./locale/en/\n')
for alpha2 in language_codes: for alpha2 in language_codes:
if alpha2 == 'en': if alpha2 == 'en':
continue continue
f.write(u'locale ublock ' + alpha2 + ' ./locale/' + alpha2 + '/\n') f.write(u'locale ublock0 ' + alpha2 + ' ./locale/' + alpha2 + '/\n')
rmtree(source_locale_dir) rmtree(source_locale_dir)

12
tools/make-firefox.sh
View File

@ -2,9 +2,9 @@
# #
# This script assumes a linux environment # This script assumes a linux environment
echo "*** uBlock.firefox: Copying files" echo "*** uBlock0.firefox: Copying files"
DES=dist/build/uBlock.firefox DES=dist/build/uBlock0.firefox
rm -rf $DES rm -rf $DES
mkdir -p $DES mkdir -p $DES
@ -26,14 +26,14 @@ cp platform/firefox/install.rdf $DES/
cp platform/firefox/*.xul $DES/ cp platform/firefox/*.xul $DES/
cp LICENSE.txt $DES/ cp LICENSE.txt $DES/
echo "*** uBlock.firefox: Generating meta..." echo "*** uBlock0.firefox: Generating meta..."
python tools/make-firefox-meta.py $DES/ python tools/make-firefox-meta.py $DES/
if [ "$1" = all ]; then if [ "$1" = all ]; then
echo "*** uBlock.firefox: Creating package..." echo "*** uBlock0.firefox: Creating package..."
pushd $DES/ pushd $DES/
zip ../uBlock.firefox.xpi -qr * zip ../uBlock0.firefox.xpi -qr *
popd popd
fi fi
echo "*** uBlock.firefox: Package done." echo "*** uBlock0.firefox: Package done."