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

code review

This commit is contained in:
gorhill 2015-11-24 13:21:14 -05:00
parent e1def0dc7e
commit 25c73d9f02
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/js/redirect-engine.js
View File

@ -211,7 +211,18 @@ RedirectEngine.prototype.supportedTypes = (function() {
RedirectEngine.prototype.resourcesFromString = function(text) {
var textEnd = text.length;
var lineBeg = 0, lineEnd;
var line, fields, resource, encoded, data;
var line, fields;
var resourceFromFields = function(fields) {
var encoded = fields[1].indexOf(';') !== -1;
var data = fields.slice(2).join(encoded ? '' : '\n');
this.resources[fields[0]] =
'data:' +
fields[1] +
(encoded ? '' : ';base64') +
',' +
(encoded ? data : btoa(data));
}.bind(this);
this.resources = Object.create(null);
@ -230,31 +241,28 @@ RedirectEngine.prototype.resourcesFromString = function(text) {
continue;
}
if ( resource === undefined ) {
if ( fields === undefined ) {
fields = line.split(/\s+/);
if ( fields.length !== 2 ) {
continue;
fields = undefined;
}
resource = fields;
continue;
}
if ( line !== '' ) {
resource.push(line);
fields.push(line);
continue;
}
// No more data, store the resource.
encoded = resource[1].indexOf(';') !== -1;
data = resource.slice(2).join(encoded ? '' : '\n');
this.resources[resource[0]] =
'data:' +
resource[1] +
(encoded ? '' : ';base64') +
',' +
(encoded ? data : btoa(data));
// No more data, add the resource.
resourceFromFields(fields);
resource = undefined;
fields = undefined;
}
// Process pending resource data.
if ( fields !== undefined ) {
resourceFromFields(fields);
}
};