Release 4.1.3

See website changelog

Info.plist

@@ -13,9 +13,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.2</string>
+	<string>4.1.3</string>
 	<key>CFBundleVersion</key>
-	<string>180</string>
+	<string>181</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>179</string>
+       <string>180</string>
        <key>CFBundleShortVersionString</key>
-       <string>4.1.1.1</string>
+       <string>4.1.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>179</string>
+       <string>180</string>
        <key>CFBundleShortVersionString</key>
-       <string>4.1.1.1</string>
+       <string>4.1.2</string>
        <key>URL</key>
        <string>http://dl.dropbox.com/u/11967/JS%20BlockerBeta.safariextz</string>
      </dict>

i18n/en-us.js

@@ -750,7 +750,7 @@ Strings['en-us'] = {
 
 	'Update lists now:': 'Update lists now:',
 	'Update user scripts now:': 'Update user scripts now:',
-	'Re-download user scripts:': 'Re-download user scripts',
+	'Re-download user scripts:': 'Re-download user scripts:',
 	'Update Now': 'Update Now',
 	'Updating...': 'Updating...',
 	'Download': 'Download',

js/after.js

@@ -551,7 +551,7 @@ user_scripts = {
 						'<p><input type="button" id="jsb-install-user-script" value="', r.strings['Create Script'], '" /></p>'
 					].join(''),
 				}, function (info) {
-					var al = document.getElementById('jsb-alert-' + info.id);
+					var al = document.getElementById(info.id);
 
 					al.querySelector('#jsb-install-user-script').addEventListener('click', function () {
 						this.value = r.strings['Adding...'];

js/global.js

@@ -272,7 +272,7 @@ var RULE_TOP_HOST = 1,
 
 			for (var host in this.caches.rule_actions[key]) {
 				for (var action_item in this.caches.rule_actions[key][host]) {
-					if (this.caches.rule_actions[key][host][action_item].access < (Date.now() - 1000 * 60 * 20))
+					if (this.caches.rule_actions[key][host][action_item].access < (Date.now() - 1000 * 60 * 120))
 						delete this.caches.rule_actions[key][host][action_item];
 				}
 
@@ -3854,7 +3854,7 @@ var RULE_TOP_HOST = 1,
 					e.each(function () {
 						var ee = $(this);
 
-						ee.show().css('marginTop', -(e.height() / 3)).animate({
+						ee.show().css('marginTop', -(ee.height() / 3)).animate({
 							marginTop: 0
 						}, speed * self.speedMultiplier);
 
@@ -3887,7 +3887,7 @@ var RULE_TOP_HOST = 1,
 					})
 
 					ee.css('marginTop', 0).animate({
-						marginTop: -(e.height() / 3)
+						marginTop: -(ee.height() / 3)
 					}, speed * self.speedMultiplier, function () {
 						self.utils.timer.timeout('adjuster', function () { adjuster(); }, 50);
 
@@ -4244,7 +4244,7 @@ var RULE_TOP_HOST = 1,
 
 			if (!e.length) e = me.parent().next().next().find('.main-wrapper');
 
-			var o = e.outerHeight(), oT = e.outerHeight(true), a = e.css('opacity') === '1';
+			var a = e.css('opacity') === '1';
 
 			if (e.is(':animated')) return false;
 
@@ -4255,7 +4255,7 @@ var RULE_TOP_HOST = 1,
 			if (!a) head.removeClass('collapsed');
 
 			e.each(function () {
-				var ee = $(this);
+				var ee = $(this), o = ee.outerHeight(), oT = ee.outerHeight(true);
 
 				ee.find('li').each(function () {
 					var t = $(this), h = t.height();
@@ -5716,7 +5716,7 @@ var RULE_TOP_HOST = 1,
 
 			var pop = Popover.window();
 
-			if (pop.document && pop.document.body) {
+			if (pop && pop.document && pop.document.body) {
 				this.popover = pop.document;
 				this.set_theme();
 

js/setting_items.js

@@ -344,8 +344,19 @@ Settings.settings = {
 			if_setting: { enableimage: true },
 			help: Settings._alwaysBlockHelp,
 			default: 'nowhere',
-			extra: 1
-		}
+			extra: 1,
+			divider: 1
+		},
+		easy_list_last_update: {
+			id: 'easy-list-update',
+			label: '',
+			classes: 'description'
+		},
+		easyListNow: {
+			classes: 'single-click',
+			label: 'Update lists now:',
+			setting: 'Update Now'
+		},
 	},
 	snapshots: {
 		enableSnapshots: {
@@ -538,6 +549,25 @@ Settings.settings = {
 			classes: 'single-click',
 			setting: 'Create Script',
 			label: '',
+			extra: 1,
+			divider: 1
+		},
+		user_script_last_update: {
+			id: 'user-script-update',
+			label: '',
+			classes: 'description',
+			extra: 1
+		},
+		userScriptNow: {
+			classes: 'single-click',
+			label: 'Update user scripts now:',
+			setting: 'Update Now',
+			extra: 1
+		},
+		userScriptRedownload: {
+			classes: 'single-click',
+			label: 'Re-download user scripts:',
+			setting: 'Download',
 			extra: 1
 		}
 	},
@@ -557,17 +587,6 @@ Settings.settings = {
 			classes: 'description',
 			divider: 1
 		},
-		easy_list_last_update: {
-			id: 'easy-list-update',
-			label: '',
-			classes: 'description'
-		},
-		easyListNow: {
-			classes: 'single-click',
-			label: 'Update lists now:',
-			setting: 'Update Now',
-			divider: 1
-		},
 		resetSettings: {
 			label: 'Reset all settings to their default values:',
 			setting: 'Reset Settings',
@@ -585,26 +604,6 @@ Settings.settings = {
 			classes: 'single-click',
 			divider: 1
 		},
-		user_script_last_update: {
-			id: 'user-script-update',
-			label: '',
-			classes: 'description',
-			extras: 1,
-			extra: 1
-		},
-		userScriptNow: {
-			classes: 'single-click',
-			label: 'Update user scripts now:',
-			setting: 'Update Now',
-			extra: 1
-		},
-		userScriptRedownload: {
-			classes: 'single-click',
-			label: 'Re-download user scripts:',
-			setting: 'Download',
-			divider: 1,
-			extra: 1
-		},
 		createBackup: {
 			label: 'Create a full backup:',
 			setting: 'Create Backup',