Skip to content

chrome flickering and tab issue #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pradeepsubramaniam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chrome flickering and tab issue #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 15 additions & 19 deletions js/iframeResizer.contentWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@
manageTriggerEvent({method:method, eventType: 'Transition Start', eventNames: ['transitionstart','webkitTransitionStart','MSTransitionStart','oTransitionStart','otransitionstart'] });
manageTriggerEvent({method:method, eventType: 'Transition Iteration', eventNames: ['transitioniteration','webkitTransitionIteration','MSTransitionIteration','oTransitionIteration','otransitioniteration'] });
manageTriggerEvent({method:method, eventType: 'Transition End', eventNames: ['transitionend','webkitTransitionEnd','MSTransitionEnd','oTransitionEnd','otransitionend'] });
if('child' === resizeFrom) {
//if('child' === resizeFrom) { // to fix on tab change before iframe loads.
manageTriggerEvent({method:method, eventType: 'IFrame Resized', eventName: 'resize' });
}
//}
}

function checkCalcMode(calcMode,calcModeDefault,modes,type) {
Expand Down Expand Up @@ -721,7 +721,8 @@
}

//Idea from https://github.com/guardian/iframe-messenger
function getMaxElement(side,elements) {
function getMaxElement(side,elements, useMargin) {
useMargin = (typeof useMargin === 'undefined' ? true : useMargin);
var
elementsLength = elements.length,
elVal = 0,
Expand All @@ -730,7 +731,8 @@
timer = getNow();

for (var i = 0; i < elementsLength; i++) {
elVal = elements[i].getBoundingClientRect()[side] + getComputedStyle('margin'+Side,elements[i]);
var marginHeight = getComputedStyle('margin' + Side, elements[i]);
elVal = elements[i].getBoundingClientRect()[side] + getComputedStyle('margin'+Side,elements[i]) + (useMargin ? marginHeight : 0);
if (elVal > maxVal) {
maxVal = elVal;
}
Expand Down Expand Up @@ -818,17 +820,9 @@
return getTaggedElements('bottom','data-iframe-height');
},

maxAll: function getMaxAllHeight() {
var currentHeight = Math.max.apply(null, getAllMeasurements(getHeight));
var leHeight = Math.max(getHeight.bodyOffset(), getMaxElement('bottom', getAllElements()));
if (currentHeight > leHeight) {
window.setTimeout(function () {
currentHeight = Math.max(getHeight.bodyOffset(), getHeight.bodyScroll(), getHeight.documentElementOffset(), getMaxElement('bottom', getAllElements()));
sendMsg(currentHeight, getWidth[widthCalcMode](), null);
}, 100);
}
return currentHeight;
}
lowestElementNoMargin: function getBestHeight() {
return Math.max(getHeight.bodyOffset(), getMaxElement('bottom', getAllElements(), false));
},
},

getWidth = {
Expand Down Expand Up @@ -879,8 +873,9 @@
function resizeIFrame() {
height = currentHeight;
width = currentWidth;

sendMsg(height,width,triggerEvent);
if (height > 50) { //do not set height if its less then
sendMsg(height,width,triggerEvent);
}
}

function isSizeChangeDetected() {
Expand Down Expand Up @@ -966,8 +961,9 @@
function triggerReset(triggerEvent) {
height = getHeight[heightCalcMode]();
width = getWidth[widthCalcMode]();

sendMsg(height,width,triggerEvent);
if (height > 50) {
sendMsg(height,width,triggerEvent);
}
}

function resetIFrame(triggerEventDesc) {
Expand Down
2 changes: 1 addition & 1 deletion js/iframeResizer.contentWindow.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/iframeResizer.contentWindow.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/iframeResizer.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 17 additions & 9 deletions src/iframeResizer.contentWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@
manageTriggerEvent({method:method, eventType: 'Transition Start', eventNames: ['transitionstart','webkitTransitionStart','MSTransitionStart','oTransitionStart','otransitionstart'] });
manageTriggerEvent({method:method, eventType: 'Transition Iteration', eventNames: ['transitioniteration','webkitTransitionIteration','MSTransitionIteration','oTransitionIteration','otransitioniteration'] });
manageTriggerEvent({method:method, eventType: 'Transition End', eventNames: ['transitionend','webkitTransitionEnd','MSTransitionEnd','oTransitionEnd','otransitionend'] });
if('child' === resizeFrom) {
//if('child' === resizeFrom) { // to fix on tab change before iframe loads.
manageTriggerEvent({method:method, eventType: 'IFrame Resized', eventName: 'resize' });
}
//}
}

function checkCalcMode(calcMode,calcModeDefault,modes,type) {
Expand Down Expand Up @@ -721,7 +721,8 @@
}

//Idea from https://github.com/guardian/iframe-messenger
function getMaxElement(side,elements) {
function getMaxElement(side,elements, useMargin) {
useMargin = (typeof useMargin === 'undefined' ? true : useMargin);
var
elementsLength = elements.length,
elVal = 0,
Expand All @@ -730,7 +731,8 @@
timer = getNow();

for (var i = 0; i < elementsLength; i++) {
elVal = elements[i].getBoundingClientRect()[side] + getComputedStyle('margin'+Side,elements[i]);
var marginHeight = getComputedStyle('margin' + Side, elements[i]);
elVal = elements[i].getBoundingClientRect()[side] + getComputedStyle('margin'+Side,elements[i]) + (useMargin ? marginHeight : 0);
if (elVal > maxVal) {
maxVal = elVal;
}
Expand Down Expand Up @@ -816,7 +818,11 @@

taggedElement: function getTaggedElementsHeight() {
return getTaggedElements('bottom','data-iframe-height');
}
},

lowestElementNoMargin: function getBestHeight() {
return Math.max(getHeight.bodyOffset(), getMaxElement('bottom', getAllElements(), false));
},
},

getWidth = {
Expand Down Expand Up @@ -867,8 +873,9 @@
function resizeIFrame() {
height = currentHeight;
width = currentWidth;

sendMsg(height,width,triggerEvent);
if (height > 50) { //do not set height if its less then
sendMsg(height,width,triggerEvent);
}
}

function isSizeChangeDetected() {
Expand Down Expand Up @@ -954,8 +961,9 @@
function triggerReset(triggerEvent) {
height = getHeight[heightCalcMode]();
width = getWidth[widthCalcMode]();

sendMsg(height,width,triggerEvent);
if (height > 50) {
sendMsg(height,width,triggerEvent);
}
}

function resetIFrame(triggerEventDesc) {
Expand Down