From 92f9284acb5d52b1dc4630de4066fd86b777fe4e Mon Sep 17 00:00:00 2001
From: "Reuven V. Gonzales" <reuven@virtru.com>
Date: Mon, 2 Jun 2014 15:25:54 -0400
Subject: [PATCH 1/6] Bumping to 0.2.1

Fixing deps
---
 component.json | 4 ++--
 template.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/component.json b/component.json
index 451aff0..7f34340 100644
--- a/component.json
+++ b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "tip",
   "description": "Tip component",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "keywords": [
     "tooltip",
     "tip",
@@ -10,7 +10,7 @@
   "dependencies": {
     "component/emitter": "*",
     "component/inherit": "*",
-    "component/jquery": "*"
+    "components/jquery": "1.9.1"
   },
   "development": {
     "component/aurora-tip": "*"
diff --git a/template.html b/template.html
index b79d0b0..d02d870 100644
--- a/template.html
+++ b/template.html
@@ -1,4 +1,4 @@
 <div class="tip tip-hide">
   <div class="tip-arrow"></div>
   <div class="tip-inner"></div>
-</div>
\ No newline at end of file
+</div>

From 3357f54579e6ce0a1d2f1af090c8496da5f0ada5 Mon Sep 17 00:00:00 2001
From: Payam Abedi <payam@virtru.com>
Date: Wed, 4 Jun 2014 11:09:25 -0400
Subject: [PATCH 2/6] bumped to 0.2.2

---
 component.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/component.json b/component.json
index 7f34340..6db13cc 100644
--- a/component.json
+++ b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "tip",
   "description": "Tip component",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "keywords": [
     "tooltip",
     "tip",
@@ -10,7 +10,7 @@
   "dependencies": {
     "component/emitter": "*",
     "component/inherit": "*",
-    "components/jquery": "1.9.1"
+    "components/jquery": "2.1.0"
   },
   "development": {
     "component/aurora-tip": "*"

From 43b760c88160927ab3f00b73df727ea59a51ee99 Mon Sep 17 00:00:00 2001
From: Payam Abedi <payam@virtru.com>
Date: Wed, 4 Jun 2014 12:12:06 -0400
Subject: [PATCH 3/6] bumped to 0.2.3

---
 component.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/component.json b/component.json
index 6db13cc..23b00ab 100644
--- a/component.json
+++ b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "tip",
   "description": "Tip component",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "keywords": [
     "tooltip",
     "tip",
@@ -10,7 +10,7 @@
   "dependencies": {
     "component/emitter": "*",
     "component/inherit": "*",
-    "components/jquery": "2.1.0"
+    "virtru-components/jquery": "2.1.0"
   },
   "development": {
     "component/aurora-tip": "*"

From 1b2fca408aa2b9670a9bc8e4422e9ab6eccc656c Mon Sep 17 00:00:00 2001
From: jamienola <jamie@virtru.com>
Date: Wed, 6 Aug 2014 17:42:01 -0400
Subject: [PATCH 4/6] bumped version to 0.2.4 and added a fix for iframe
 offsets

---
 component.json |  2 +-
 index.js       | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/component.json b/component.json
index 23b00ab..1092840 100644
--- a/component.json
+++ b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "tip",
   "description": "Tip component",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "keywords": [
     "tooltip",
     "tip",
diff --git a/index.js b/index.js
index 6555da5..5c52984 100644
--- a/index.js
+++ b/index.js
@@ -271,7 +271,25 @@ Tip.prototype.offset = function(pos){
   var ew = el.outerWidth();
   var eh = el.outerHeight();
 
-  var to = target.offset();
+  // calculate the offset, taking iFrames into account
+  var to = {top: 0, left: 0};
+  var elem = target;
+  var doc = elem.ownerDocument;
+  var win = doc.defaultView || doc.parentWindow;
+
+  do {
+    to.top += elem.offsetTop;
+    to.left += elem.offsetLeft;
+    elem = elem.offsetParent;
+
+    if(elem === null) {
+      elem = win.frameElement;
+      win = win.parent;
+    }
+  } while(elem);
+
+  console.log("CALCULATING NEW OFFSET!!", to);
+
   var tw = target.outerWidth();
   var th = target.outerHeight();
 

From 8b0b442e8c35fc45ba9cae273eb0245a0dfee297 Mon Sep 17 00:00:00 2001
From: jamienola <jamie@virtru.com>
Date: Wed, 6 Aug 2014 17:48:22 -0400
Subject: [PATCH 5/6] removed a comment

---
 index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 5c52984..217083c 100644
--- a/index.js
+++ b/index.js
@@ -277,6 +277,7 @@ Tip.prototype.offset = function(pos){
   var doc = elem.ownerDocument;
   var win = doc.defaultView || doc.parentWindow;
 
+  // iterate through DOM tree and store offset values for every iframe
   do {
     to.top += elem.offsetTop;
     to.left += elem.offsetLeft;
@@ -288,8 +289,6 @@ Tip.prototype.offset = function(pos){
     }
   } while(elem);
 
-  console.log("CALCULATING NEW OFFSET!!", to);
-
   var tw = target.outerWidth();
   var th = target.outerHeight();
 

From b24275ff5558a4915eb5cb8719f7b0ad4591300e Mon Sep 17 00:00:00 2001
From: jamienola <jamie@virtru.com>
Date: Thu, 7 Aug 2014 15:19:16 -0400
Subject: [PATCH 6/6] added check for jquery objects

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 217083c..4611c66 100644
--- a/index.js
+++ b/index.js
@@ -273,7 +273,7 @@ Tip.prototype.offset = function(pos){
 
   // calculate the offset, taking iFrames into account
   var to = {top: 0, left: 0};
-  var elem = target;
+  var elem = target instanceof jQuery ? target[0] : target;
   var doc = elem.ownerDocument;
   var win = doc.defaultView || doc.parentWindow;