Skip to content

Commit

Permalink
#438 Check jQuery wrapped not already loaded
Browse files Browse the repository at this point in the history
  • Loading branch information
davidjbradshaw committed Dec 16, 2016
1 parent f5faba3 commit 6fe29e5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ Ask the containing page for its positioning coordinates. You need to provide a c

Your callback function will be recalled when the parent page is scrolled or resized.

Pass `false` to disable the callback.
Pass `false` to disable the callback.

### scrollTo(x,y)

Expand Down Expand Up @@ -525,10 +525,11 @@ The parentIFrame methods object in the iFrame is now always available and the `e

## Version History

* v3.5.6 [#438](https://github.com/davidjbradshaw/iframe-resizer/issues/438) Check jQuery wrapper not already loaded.
* v3.5.5 [#373](https://github.com/davidjbradshaw/iframe-resizer/issues/373) Add option for custom size calculation methods in iFrame. [#374](https://github.com/davidjbradshaw/iframe-resizer/issues/374) Fix bug with in page links called from parent page.
* v3.5.4 [#362](https://github.com/davidjbradshaw/iframe-resizer/issues/362) Handle jQuery being loaded in odd ways. [#297](https://github.com/davidjbradshaw/iframe-resizer/issues/297) Ensure document ready before resizing
* v3.5.3 [#283](https://github.com/davidjbradshaw/iframe-resizer/issues/283) Added *readystatechange* event listener.
* v3.5.2 [#314](https://github.com/davidjbradshaw/iframe-resizer/pull/314) Add iframeHeight and iframeWidth properties to pageInfo [[Pierre Olivier](https://github.com/pomartel)]. [#303](https://github.com/davidjbradshaw/iframe-resizer/issues/303) Fix issue with IE8 polyFils.
* v3.5.2 [#314](https://github.com/davidjbradshaw/iframe-resizer/pull/314) Add iframeHeight and iframeWidth properties to pageInfo [[Pierre Olivier](https://github.com/pomartel)]. [#303](https://github.com/davidjbradshaw/iframe-resizer/issues/303) Fix issue with IE8 polyFils.
* v3.5.1 [#286](https://github.com/davidjbradshaw/iframe-resizer/issues/286) Fixed *taggedElement / lowestElement / rightMostElement* to calculate correct margin [[Dan Ballance](danballance)].
* v3.5.0 Recall getPageInfo callback when parent page position changes. Added *Array.prototype.forEach* to IE8 polyfils.
* v3.4.2 Only teardown events on close if currently enabled.
Expand Down
8 changes: 4 additions & 4 deletions src/iframeResizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@
function debouncedTrigger(){
trigger(
'Send Page Info',
'pageInfo:' + getPageInfo(),
iframe,
'pageInfo:' + getPageInfo(),
iframe,
iframeId
);
}
Expand Down Expand Up @@ -304,7 +304,7 @@
function start(){
setListener('Add ', addEventListener);
}

var id = iframeId; //Create locally scoped copy of iFrame ID

start();
Expand Down Expand Up @@ -978,7 +978,7 @@
function createJQueryPublicMethod($){
if (!$.fn) {
info('','Unable to bind to jQuery, it is not fully loaded.');
} else {
} else if (!$.fn.iFrameResize){
$.fn.iFrameResize = function $iFrameResizeF(options) {
function init(index, element) {
setupIFrame(element, options);
Expand Down

0 comments on commit 6fe29e5

Please sign in to comment.