Release 4.0.2

See website changelog.

Info.plist

@@ -13,9 +13,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.1</string>
+	<string>4.0.2</string>
 	<key>CFBundleVersion</key>
-	<string>163</string>
+	<string>164</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Database Quota</key>

extupdates.plist

@@ -10,9 +10,9 @@
        <key>Developer Identifier</key>
        <string>6S8J5HV3H4</string>
        <key>CFBundleVersion</key>
-       <string>163</string>
+       <string>164</string>
        <key>CFBundleShortVersionString</key>
-       <string>4.0.1</string>
+       <string>4.0.2</string>
        <key>URL</key>
        <string>http://dl.dropbox.com/u/11967/JS%20Blocker.safariextz</string>
      </dict>
@@ -22,9 +22,9 @@
        <key>Developer Identifier</key>
        <string>6S8J5HV3H4</string>
        <key>CFBundleVersion</key>
-       <string>163</string>
+       <string>164</string>
        <key>CFBundleShortVersionString</key>
-       <string>4.0.1</string>
+       <string>4.0.2</string>
        <key>URL</key>
        <string>http://dl.dropbox.com/u/11967/JS%20BlockerBeta.safariextz</string>
      </dict>

js/blocker.js

@@ -560,6 +560,9 @@ Events.addTabListener('message', messageHandler, true);
 if (!disabled) {
 	window.addEventListener('hashchange', hashUpdate, true);
 	window.addEventListener('message', windowMessenger, true);
+	document.addEventListener('keyup', function (event) {
+		if (event.ctrlKey && event.altKey && event.which === 74) GlobalPage.message('openPopover');
+	}, true);
 
 	if (parseInt(bv[0], 10) >= 536) {
 		var observer = new WebKitMutationObserver(function (mutations) {

js/global.js

@@ -149,8 +149,7 @@ var RULE_TOP_HOST = 1,
 						rel: 'stylesheet',
 						id: 'lang-css-' + load_language,
 				}).addClass('language-css');
-			} else
-				self.load_language(css);
+			}
 		}
 
 		var load_language = (Settings.getItem('language') !== 'Automatic') ?
@@ -175,14 +174,6 @@ var RULE_TOP_HOST = 1,
 	enabled: function (kind) {
 		if (!this.donationVerified && kind !== 'script') return false;
 
-		if (kind === 'special') {
-			for (var item in Settings.settings.other)
-				if ((~item.indexOf('enable_special_') || item.indexOf('customp') === 0) && this.special_enabled(item.substr('enable_special_'.length)))
-					return true;
-
-			return false;
-		}
-
 		return Settings.getItem('enable' + kind);
 	},
 
@@ -3086,6 +3077,8 @@ var RULE_TOP_HOST = 1,
 					var first = select.find('option:eq(' + li.data('pending_index') + ')'), to_do = first.attr('data-part');
 
 					if (first.length) {
+						new Poppy();
+
 						li.addClass('pending')
 							.data('pending_data', first.val());
 
@@ -5028,6 +5021,10 @@ var RULE_TOP_HOST = 1,
 			case 'notification':
 				MessageTarget(event, 'notification', [event.message[0], event.message[1]]);
 			break;
+
+			case 'openPopover':
+				ToolbarItems.showPopover();
+			break;
 
 			case 'doNothing': break;
 		}
@@ -5180,7 +5177,7 @@ var RULE_TOP_HOST = 1,
 		});
 	},
 	validate: function (event) {
-		if (event && event.command && event.command !== 'jsBlockerMenu') return;
+		if (!BrowserWindows.active() || (event && event.command && event.command !== 'jsBlockerMenu')) return;
 
 		var self = this;
 

js/poppies.js

@@ -48,6 +48,7 @@ JB.poppies = {
 						} else if (datai >= 0) {
 							JB.donationVerified = id;
 							JB.trialStart = -1;
+							JB.popover_current = null;
 
 							new Poppy(zoo.me[0], zoo.me[1], [
 								'<p>', _('Your donation has been verified'), '</p>',
@@ -59,7 +60,7 @@ JB.poppies = {
 
 									setTimeout(function () {
 										Tabs.messageActive('updatePopover');
-									}, 1000);
+									}, 100);
 								} catch (e) {}
 							}, 3000);
 						} else
@@ -89,11 +90,15 @@ JB.poppies = {
 							$$('#unlock').click();
 						}).siblings('#continue').click(function () {
 							JB.donationVerified = 777;
+							JB.popover_current = null;
+
 							try {
+
 								Popover.window().location.reload();
+
 								setTimeout(function () {
 									Tabs.messageActive('updatePopover');
-								}, 1000);
+								}, 100);
 							} catch (e) {}
 						});
 					});