Browse Source

fixed parsing of partial rules

pull/2/head
gorhill 10 years ago
parent
commit
65a8000657
  1. 0
      src/hosts-files.html
  2. 0
      src/js/hosts-files.js
  3. 10
      src/js/matrix.js

0
src/ubiquitous-rules.html → src/hosts-files.html

0
src/js/ubiquitous-rules.js → src/js/hosts-files.js

10
src/js/matrix.js

@ -341,12 +341,12 @@ Matrix.prototype.evaluateCellZXY = function(srcHostname, desHostname, type) {
var pos; var pos;
var d = desHostname; var d = desHostname;
var firstPartDesDomain = extractFirstPartyDesDomain(srcHostname, desHostname);
var firstPartyDesDomain = extractFirstPartyDesDomain(srcHostname, desHostname);
// Ancestor cells, up to 1st-party destination domain // Ancestor cells, up to 1st-party destination domain
if ( firstPartDesDomain !== '' ) {
if ( firstPartyDesDomain !== '' ) {
for (;;) { for (;;) {
if ( d === firstPartDesDomain ) {
if ( d === firstPartyDesDomain ) {
break; break;
} }
d = d.slice(d.indexOf('.') + 1); d = d.slice(d.indexOf('.') + 1);
@ -643,7 +643,7 @@ Matrix.prototype.fromString = function(text, append) {
fieldVal = fields[2]; fieldVal = fields[2];
if ( fieldVal !== null ) {
if ( fieldVal !== undefined ) {
type = fieldVal; type = fieldVal;
// Unknown type: reject // Unknown type: reject
if ( typeBitOffsets.hasOwnProperty(type) === false ) { if ( typeBitOffsets.hasOwnProperty(type) === false ) {
@ -655,7 +655,7 @@ Matrix.prototype.fromString = function(text, append) {
fieldVal = fields[3]; fieldVal = fields[3];
if ( fieldVal !== null ) {
if ( fieldVal !== undefined ) {
// Unknown state: reject // Unknown state: reject
if ( nameToStateMap.hasOwnProperty(fieldVal) === false ) { if ( nameToStateMap.hasOwnProperty(fieldVal) === false ) {
continue; continue;

Loading…
Cancel
Save