diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-09 20:52:28 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-03-09 20:52:28 +0000 |
| commit | 290fe38c571c278fd9e43401870f7f81b83f2a8a (patch) | |
| tree | 0315fb6fe3e2d70bb989eb37cbc872b129005724 /modules | |
| parent | 2787acc050ac046337aac300915a5e664d90f918 (diff) | |
| download | brdo-290fe38c571c278fd9e43401870f7f81b83f2a8a.tar.gz brdo-290fe38c571c278fd9e43401870f7f81b83f2a8a.tar.bz2 | |
#653580 by mfer, Rob Loach, cosmicdreams, et al: Upgrade to jQuery 1.4.2.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/overlay/overlay-child.js | 2 | ||||
| -rw-r--r-- | modules/overlay/overlay-parent.js | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/overlay/overlay-child.js b/modules/overlay/overlay-child.js index 1445b32b7..018445517 100644 --- a/modules/overlay/overlay-child.js +++ b/modules/overlay/overlay-child.js @@ -23,7 +23,7 @@ Drupal.behaviors.overlayChild = { // If we cannot reach the parent window, then we have nothing else to do // here. - if (!$.isObject(parent.Drupal) || !$.isObject(parent.Drupal.overlay)) { + if (!$.isPlainObject(parent.Drupal) || !$.isPlainObject(parent.Drupal.overlay)) { return; } diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index 78efe9088..dd064faa3 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -598,7 +598,7 @@ Drupal.overlay.innerResize = function (height) { } // When no height is given try to get height when iframe content is loaded. - if (!height && $.isObject(self.$iframeBody)) { + if (!height && self.$iframeBody) { height = self.$iframeBody.outerHeight() + 25; } diff --git a/modules/system/system.module b/modules/system/system.module index 40bad7573..7d359303f 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1046,7 +1046,7 @@ function system_library() { $libraries['jquery'] = array( 'title' => 'jQuery', 'website' => 'http://jquery.com', - 'version' => '1.3.2', + 'version' => '1.4.2', 'js' => array( 'misc/jquery.js' => array('weight' => JS_LIBRARY - 20), ), |