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

Merge tag '1.5.2'

This commit is contained in:
gorhill 2015-12-29 23:05:51 -05:00
parent 965028513b ce8ea0b31b
commit adc357b522
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/chromium/manifest.json
View File

@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "uBlock Origin",
"version": "1.5.1",
"version": "1.5.2",
"default_locale": "en",
"description": "__MSG_extShortDesc__",

26
platform/chromium/vapi-background.js
View File

@ -112,19 +112,19 @@ vAPI.browserSettings = {
// https://github.com/gorhill/uBlock/issues/533#issuecomment-164292868
// If WebRTC is supported, there won't be an exception if we
// try to instanciate a peer connection object.
var pc = null;
try {
var PC = self.RTCPeerConnection || self.webkitRTCPeerConnection;
if ( PC ) {
pc = new PC(null);
}
} catch (ex) {
console.error(ex);
}
if ( pc === null ) {
break;
}
pc.close();
//var pc = null;
//try {
// var PC = self.RTCPeerConnection || self.webkitRTCPeerConnection;
// if ( PC ) {
// pc = new PC(null);
// }
//} catch (ex) {
// console.error(ex);
//}
//if ( pc === null ) {
// break;
//}
//pc.close();
// https://github.com/gorhill/uBlock/issues/533
// If we reach this point, the property

2
platform/opera/manifest.json
View File

@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "uBlock Origin",
"version": "1.5.1",
"version": "1.5.2",
"default_locale": "en",
"description": "__MSG_extShortDesc__",