Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-04 16:47:15 +02:00
Code Issues Releases Wiki Activity

#1013: Firefox support

Browse Source
This commit is contained in:
gorhill 2015-03-26 09:50:07 -04:00
parent 0ca84246f5
commit 2504f8ad35
2 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1119,13 +1119,18 @@ var httpObserver = {
return true; return true;
} }
/*if ( result.redirectUrl ) { if ( result.redirectUrl ) {
channel.redirectionLimit = 1; if ( type === 'main_frame' ) {
channel.cancel(this.ABORT);
vAPI.tabs.open({ tabId: details.tabId, url: result.redirectUrl });
return true;
}
/*channel.redirectionLimit = 1;
channel.redirectTo( channel.redirectTo(
Services.io.newURI(result.redirectUrl, null, null) Services.io.newURI(result.redirectUrl, null, null)
); );
return true; return true;*/
}*/ }
return false; return false;
}, },

51
src/js/i18n.js
View File

@ -20,7 +20,13 @@
*/ */
/* global vAPI, uDom */ /* global vAPI, uDom */
/* exported renderElapsedTime */
/******************************************************************************/
// This file should always be included at the end of the `body` tag, so as
// to ensure all i18n targets are already loaded.
(function() {
'use strict'; 'use strict';
@ -28,25 +34,26 @@
// Helper to deal with the i18n'ing of HTML files. // Helper to deal with the i18n'ing of HTML files.
uDom.onLoad(function() { uDom('[data-i18n]').forEach(function(elem) {
uDom('[data-i18n]').forEach(function(elem) { elem.html(vAPI.i18n(elem.attr('data-i18n')));
elem.html(vAPI.i18n(elem.attr('data-i18n'))); });
});
uDom('[title]').forEach(function(elem) { uDom('[title]').forEach(function(elem) {
var title = vAPI.i18n(elem.attr('title')); var title = vAPI.i18n(elem.attr('title'));
if ( title ) { if ( title ) {
elem.attr('title', title); elem.attr('title', title);
} }
}); });
uDom('[placeholder]').forEach(function(elem) {
elem.attr('placeholder', vAPI.i18n(elem.attr('placeholder'))); uDom('[placeholder]').forEach(function(elem) {
}); elem.attr('placeholder', vAPI.i18n(elem.attr('placeholder')));
uDom('[data-i18n-tip]').forEach(function(elem) { });
elem.attr(
'data-tip', uDom('[data-i18n-tip]').forEach(function(elem) {
vAPI.i18n(elem.attr('data-i18n-tip')).replace(/<br>/g, '') elem.attr(
); 'data-tip',
}); vAPI.i18n(elem.attr('data-i18n-tip')).replace(/<br>/g, '')
);
}); });
/******************************************************************************/ /******************************************************************************/
@ -74,3 +81,7 @@ vAPI.i18n.renderElapsedTimeToString = function(tstamp) {
}; };
/******************************************************************************/ /******************************************************************************/
})();
/******************************************************************************/