summaryrefslogtreecommitdiff
path: root/modules/overlay
diff options
context:
space:
mode:
Diffstat (limited to 'modules/overlay')
-rw-r--r--modules/overlay/overlay-child.js2
-rw-r--r--modules/overlay/overlay-parent.js2
2 files changed, 2 insertions, 2 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;
}