Release v1.20rc2

dhowe · Apr 23, 2015 · bd60ec6 · bd60ec6
1 parent 2e878ba
commit bd60ec6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 28 deletions.
diff --git a/data/elemhide.js b/data/elemhide.js
@@ -67,32 +67,6 @@ var admatchers = [
     //{ selector: "div[class^=ad]", waitfor: "div.l_qq_com > iframe", handler: qqImg2, name: 'qq2' }
 ];
 
-// TODO: restrict these to specific domain ?
-
-function msnImg(anchor) { // not used now (all in iframes) 
-
-    console.log('msnImg: ', anchor.length);
-
-    var targetUrl = anchor.attr('href'),
-        imgTag = anchor.find('img');
-
-    console.log('anchor: ', anchor.html);
-    console.log('targetUrl: ', targetUrl);
-    console.log('imgTag: ', imgTag.length);
-
-    if (!imgTag.length) return;
-
-    var img = imgTag.attr('src');
-
-    if (targetUrl.length && img.length) {
-
-        var ad = createImgAd('qq', img, targetUrl);
-        self.port && self.port.emit('parsed-img-ad', ad);
-    } else {
-        console.warn('sohuImg.fail: ', img, targetUrl);
-    }
-}
-
 function sohuImg(anchor) {
 
     //console.log('sohuImg: ', anchor.length);

diff --git a/locale/en-US.properties b/locale/en-US.properties
@@ -2,7 +2,7 @@ adn.menu.pause=Pause Adnauseam
 adn.menu.start=Start Adnauseam
 
 adn.menu.adsDetected=clicked
-adn.menu.adsFound=ads detected
+adn.menu.adsFound=ads on this page
 adn.menu.ofThe=of the
 adn.menu.settings=Settings
 adn.menu.viewAdVault=View Ad Vault

diff --git a/locale/fr.properties → locale/fr-FR.properties b/locale/fr.properties → locale/fr-FR.properties
diff --git a/pub-xpi.sh b/pub-xpi.sh
@@ -18,9 +18,10 @@ XPI_FILE="adnauseam-$1.xpi"
 
 echo Publishing $XPI_FILE
 echo "  to $RED:$XPI_DIR"
-echo "  not linked"
+echo "  (not linking)"
 
 #cat adnauseam.xpi | /usr/bin/ssh ${RED} "(cd ${XPI_DIR} && /bin/rm -f $XPI_FILE && cat - > $XPI_FILE && ln -fs $XPI_FILE adnauseam.xpi && ls -l)" 
+
 cat adnauseam.xpi | /usr/bin/ssh ${RED} "(cd ${XPI_DIR} && /bin/rm -f $XPI_FILE && cat - > $XPI_FILE)"