Only show "Add a rule" on HTTPS sites.

jsha · jsha · commit 47a500651a02 · 2015-03-03T13:43:10.000-08:00
Also fix makecrx.sh
diff --git a/chromium/popup.css b/chromium/popup.css
@@ -93,3 +93,9 @@ footer {
   margin-top: 16px;
   padding: 8px 0;
 }
+
+/* By default the "Add a rule" link is hidden. It's shown on HTTPS sites for
+ * which there is no rule. */
+#add-rule-link {
+  display: none
+}
diff --git a/chromium/popup.js b/chromium/popup.js
@@ -78,6 +78,10 @@ function gotTab(tab) {
     listDiv.style.position = "static";
     listDiv.style.visibility = "visible";
   }
+  // Only show the "Add a rule" link if we're on an HTTPS page
+  if (/^https:/.test(tab.url)) {
+    show(e("add-rule-link"));
+  }
 }
 
 document.addEventListener("DOMContentLoaded", function () {
diff --git a/makecrx.sh b/makecrx.sh
@@ -18,6 +18,7 @@
 # "dummy-chromium.pem" private key for you to sign your own local releases,
 # but these .crx files won't detect and upgrade to official HTTPS Everywhere
 # releases signed by EFF :/.  We should find a more elegant arrangement.
+RULESETS_SQLITE="$PWD/src/defaults/rulesets.sqlite"
 
 if [ -n "$1" ]; then
   if [ "$1" = today ] ; then
@@ -52,18 +53,7 @@ die() {
 }
 
 if [ "$1" != "--fast" ] ; then
-  if [ -f utils/trivial-validate.py ]; then
-    VALIDATE="python2.7 ./utils/trivial-validate.py --ignoredups google --ignoredups facebook"
-  elif [ -f trivial-validate.py ] ; then
-    VALIDATE="python2.7 trivial-validate.py --ignoredups google --ignoredups facebook"
-  elif [ -x utils/trivial-validate ] ; then
-    # This case probably never happens
-    VALIDATE=./utils/trivial-validate
-  else
-    VALIDATE=./trivial-validate
-  fi
-
-  if $VALIDATE src/chrome/content/rules >&2
+  if python2.7 ./utils/trivial-validate.py --quiet --db $RULESETS_SQLITE >&2
   then
     echo Validation of included rulesets completed. >&2
     echo >&2

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,10 @@ function gotTab(tab) {`
`78`	`78`	`listDiv.style.position = "static";`
`79`	`79`	`listDiv.style.visibility = "visible";`
`80`	`80`	`}`
	`81`	`+ // Only show the "Add a rule" link if we're on an HTTPS page`
	`82`	`+ if (/^https:/.test(tab.url)) {`
	`83`	`+ show(e("add-rule-link"));`
	`84`	`+ }`
`81`	`85`	`}`
`82`	`86`
`83`	`87`	`document.addEventListener("DOMContentLoaded", function () {`