Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tether",
"version": "1.3.2",
"version": "1.3.3",
"homepage": "http://github.hubspot.com/tether",
"authors": [
"Zack Bloom <[email protected]>",
Expand Down
17 changes: 13 additions & 4 deletions dist/js/tether.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tether 1.3.2 */
/*! tether 1.3.3 */

(function(root, factory) {
if (typeof define === 'function' && define.amd) {
Expand Down Expand Up @@ -429,7 +429,7 @@ var transformKey = (function () {
}
var el = document.createElement('div');

var transforms = ['transform', 'webkitTransform', 'OTransform', 'MozTransform', 'msTransform'];
var transforms = ['transform', 'WebkitTransform', 'OTransform', 'MozTransform', 'msTransform'];
for (var i = 0; i < transforms.length; ++i) {
var key = transforms[i];
if (el.style[key] !== undefined) {
Expand Down Expand Up @@ -1178,7 +1178,16 @@ var TetherClass = (function (_Evented) {
};

var moved = false;
if ((same.page.top || same.page.bottom) && (same.page.left || same.page.right)) {
if (this.options.optimizations && this.options.optimizations.doNotMoveInDOM) {
css.position = 'fixed';
if ((same.viewport.top || same.viewport.bottom) && (same.viewport.left || same.viewport.right)) {
transcribe(same.viewport, pos.viewport);
} else if (typeof same.offset !== 'undefined' && same.offset.top && same.offset.left) {
transcribe(same.offset, pos.offset);
} else {
transcribe({ top: true, left: true }, pos.viewport);
}
} else if ((same.page.top || same.page.bottom) && (same.page.left || same.page.right)) {
css.position = 'absolute';
transcribe(same.page, pos.page);
} else if ((same.viewport.top || same.viewport.bottom) && (same.viewport.left || same.viewport.right)) {
Expand Down Expand Up @@ -1206,7 +1215,7 @@ var TetherClass = (function (_Evented) {
transcribe({ top: true, left: true }, pos.page);
}

if (!moved) {
if (!(this.options.optimizations && this.options.optimizations.doNotMoveInDOM) && !moved) {
var offsetParentIsBody = true;
var currentNode = this.element.parentNode;
while (currentNode && currentNode.nodeType === 1 && currentNode.tagName !== 'BODY') {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/tether.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tether",
"version": "1.3.2",
"version": "1.3.3",
"description": "A client-side library to make absolutely positioned elements attach to elements in the page efficiently.",
"authors": [
"Zack Bloom <[email protected]>",
Expand Down
13 changes: 11 additions & 2 deletions src/js/tether.js
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,16 @@ class TetherClass extends Evented {
};

let moved = false;
if ((same.page.top || same.page.bottom) && (same.page.left || same.page.right)) {
if (this.options.optimizations && this.options.optimizations.doNotMoveInDOM ) {
css.position = 'fixed';
if ((same.viewport.top || same.viewport.bottom) && (same.viewport.left || same.viewport.right)) {
transcribe(same.viewport, pos.viewport);
} else if (typeof same.offset !== 'undefined' && same.offset.top && same.offset.left) {
transcribe(same.offset, pos.offset);
} else {
transcribe({ top: true, left: true }, pos.viewport);
}
} else if ((same.page.top || same.page.bottom) && (same.page.left || same.page.right)) {
css.position = 'absolute';
transcribe(same.page, pos.page);

Expand All @@ -745,7 +754,7 @@ class TetherClass extends Evented {
transcribe({top: true, left: true}, pos.page);
}

if (!moved) {
if (!(this.options.optimizations && this.options.optimizations.doNotMoveInDOM) && !moved) {
let offsetParentIsBody = true;
let currentNode = this.element.parentNode;
while (currentNode && currentNode.nodeType === 1 && currentNode.tagName !== 'BODY') {
Expand Down