fixed bugs causing too many injected rules, and wrongly parsing exceptions

gorhill · gorhill · commit 8aff8064193d · 2014-05-18T19:56:35.000-04:00
diff --git a/js/abp-hide-filters.js b/js/abp-hide-filters.js
@@ -79,9 +79,12 @@ var FilterPlain = function(s) {
 };
 
 FilterPlain.prototype.retrieve = function(s, out) {
-    if ( s === this.s.slice(0, s.length) ) {
+    if ( s === this.s ) {
         out.push(this.s);
     }
+//    if ( s === this.s.slice(0, s.length) ) {
+//        out.push(this.s);
+//    }
 };
 
 /******************************************************************************/
@@ -92,7 +95,7 @@ var FilterPlainHostname = function(s, hostname) {
 };
 
 FilterPlainHostname.prototype.retrieve = function(s, out) {
-    if ( s === this.s.slice(0, s.length) && pageHostname === this.hostname ) {
+    if ( s === this.s && pageHostname === this.hostname ) {
         out.push(this.s);
     }
 };
@@ -147,7 +150,7 @@ FilterParser.prototype.parse = function(s) {
 
     this.anchor = s.indexOf('##');
     if ( this.anchor < 0 ) {
-        this.anchor = s.indexOf('#@');
+        this.anchor = s.indexOf('#@#');
         if ( this.anchor < 0 ) {
             this.invalid = true;
             return this;
@@ -157,7 +160,11 @@ FilterParser.prototype.parse = function(s) {
     if ( this.anchor > 0 ) {
         this.hostnames = s.slice(0, this.anchor).split(/\s*,\s*/);
     }
-    this.f = s.slice(this.anchor + 2);
+    if ( this.filterType === '@' ) {
+        this.f = s.slice(this.anchor + 3);
+    } else {
+        this.f = s.slice(this.anchor + 2);
+    }
 
     // selector
     var selectorType = this.f.charAt(0);
diff --git a/js/contentscript-elemhide.js b/js/contentscript-elemhide.js
@@ -27,12 +27,16 @@ var retrieveHandler = function(selectors) {
     }
     var styleText = [];
     if ( selectors.hide.length > 0 ) {
-        var hideStyleText = '{{hideSelectors}} {visibility:hidden;display:none;}';
-        styleText.push(hideStyleText.replace('{{hideSelectors}}', selectors.hide.join(',')));
+        var hideStyleText = '{{hideSelectors}} {display:none;}'
+            .replace('{{hideSelectors}}', selectors.hide.join(','));
+        styleText.push(hideStyleText);
+        console.log('ABP cosmetic filters: injecting CSS rule:', hideStyleText);
     }
     if ( selectors.donthide.length > 0 ) {
-        var dontHideStyleText = '{{donthideSelectors}} {visibility:inherit;display:inherit;}';
-        styleText.push(donthideStyleText.replace('{{donthideSelectors}}', selectors.donthide.join(',')));
+        var dontHideStyleText = '{{donthideSelectors}} {display:initial;}'
+            .replace('{{donthideSelectors}}', selectors.donthide.join(','));
+        styleText.push(donthideStyleText);
+        console.log('ABP cosmetic filters: injecting CSS rule:', donthideStyleText);
     }
     if ( styleText.length > 0 ) {
         var style = document.createElement('style');
