Skip to content
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

Fixed wrong behavior while using jQuery.noConflict and added test #104

Merged
merged 1 commit into from
Oct 11, 2014
Merged

Fixed wrong behavior while using jQuery.noConflict and added test #104

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
2 changes: 1 addition & 1 deletion js/iframeResizer.contentWindow.min.js
View file
Open in desktop

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

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.

4 changes: 2 additions & 2 deletions src/iframeResizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
}

function init(msg){
//We have to call trigger twice, as we can not be sure if all
//We have to call trigger twice, as we can not be sure if all
//iframes have completed loading when this code runs. The
//event listener also catches the page changing in the iFrame.
addEventListener(iframe,'load',function(){
Expand Down Expand Up @@ -431,7 +431,7 @@
setupRequestAnimationFrame();
addEventListener(window,'message',iFrameListener);

if ('jQuery' in window) { createJQueryPublicMethod(jQuery); }
if (window.jQuery) { createJQueryPublicMethod(jQuery); }

if (typeof define === 'function' && define.amd) {
define(function (){ return createNativePublicFunction(); });
Expand Down
Loading