CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-02 02:14:52 +12:00
Code Issues Releases Wiki Activity

fixed parsing of partial rules

Browse source
This commit is contained in:
gorhill 2014-10-23 19:37:59 -04:00
parent a7e1337820
commit 65a8000657
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

10
src/js/matrix.js
View file

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