Merge remote-tracking branch 'origin/master' into new-tab

Conflicts:
	app/manifest.json

.travis.yml

@@ -3,6 +3,8 @@ language: node_js
 node_js:
   - "0.12"
 
+sudo: false
+
 before_install:
   - npm install -g grunt-cli
   - "echo -n {} >> keys.json"

app/js/widgets/framefix.js

@@ -1,12 +1,22 @@
 /**
  * This creates an onHeadersReceived listener on an as-needed basis.
  */
-define(function() {
-	var listening = false;
+define(["jquery"], function($) {
+	var listening = false,
+		attaching = false,
+		callbacks = [];
 
 	var check = function(cb, ctx, args) {
 		if (listening) return true;
-
+
+		callbacks.push(function() {
+			cb.apply(ctx, args);
+		});
+
+		if (attaching) return false;
+
+		attaching = true;
+
 		chrome.tabs.getCurrent(function(tab) {
 			chrome.webRequest.onHeadersReceived.addListener(
 				function(info) {
@@ -33,8 +43,13 @@ define(function() {
 			);
 
 			listening = true;
+			attaching = false;
 
-			cb.apply(ctx, args);
+			callbacks.forEach(function(cb) {
+				cb();
+			});
+
+			callbacks = [];
 		});
 
 		return false;

app/manifest.json

@@ -59,7 +59,7 @@
 		"bookmarks",
 		"management"
 	],
-	"version": "2.1.16",
+	"version": "2.1.17",
 	"manifest_version": 2,
 	"default_locale": "en",
 	"short_name": "iChrome",