]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3b4cef1)
Dialog: Removed shadow option due to introducing too many bugs. (Reopens #3681).
authorScott González <scott.gonzalez@gmail.com>
Thu, 5 Feb 2009 14:30:59 +0000 (14:30 +0000)
committerScott González <scott.gonzalez@gmail.com>
Thu, 5 Feb 2009 14:30:59 +0000 (14:30 +0000)
tests/unit/dialog/dialog_defaults.js patch | blob | history
tests/visual/dialog/dialog_option_shadow_false.html [deleted file] patch | blob | history
tests/visual/dialog/dialog_option_shadow_true.html [deleted file] patch | blob | history
ui/ui.dialog.js patch | blob | history

diff --git a/tests/unit/dialog/dialog_defaults.js b/tests/unit/dialog/dialog_defaults.js
index 475f36ed235f3562727c78aea046c18bfaf10046..eb9d36bf77c00a17b0d675cab69e3938f62c9db3 100644 (file)
--- a/tests/unit/dialog/dialog_defaults.js
+++ b/tests/unit/dialog/dialog_defaults.js
@@ -19,7 +19,6 @@ var dialog_defaults = {
        modal: false,
        position: 'center',
        resizable: true,
-       shadow: false,
        stack: true,
        title: '',
        width: 300,
diff --git a/tests/visual/dialog/dialog_option_shadow_false.html b/tests/visual/dialog/dialog_option_shadow_false.html
deleted file mode 100644 (file)
index 7d7afef..0000000
--- a/tests/visual/dialog/dialog_option_shadow_false.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-       <title>Dialog Visual Test : Dialog option shadow false</title>
-       <link rel="stylesheet" href="../visual.css" type="text/css" />
-       <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
-       <script type="text/javascript" src="../../../jquery-1.3.1.js"></script>
-       <script type="text/javascript" src="../../../ui/ui.core.js"></script>
-       <script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
-       <script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-       <script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-       <script type="text/javascript">
-       $(function() {
-               $("#dialog").dialog({
-                       shadow: false
-               });
-       });
-       </script>
-</head>
-<body>
-
-<div id="dialog" title="Dialog Title">
-       <p> Dialog Content </p>
-</div>
-
-</body>
-</html>
diff --git a/tests/visual/dialog/dialog_option_shadow_true.html b/tests/visual/dialog/dialog_option_shadow_true.html
deleted file mode 100644 (file)
index 120015a..0000000
--- a/tests/visual/dialog/dialog_option_shadow_true.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-       <title>Dialog Visual Test : Dialog option shadow true</title>
-       <link rel="stylesheet" href="../visual.css" type="text/css" />
-       <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
-       <script type="text/javascript" src="../../../jquery-1.3.1.js"></script>
-       <script type="text/javascript" src="../../../ui/ui.core.js"></script>
-       <script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
-       <script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-       <script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-       <script type="text/javascript">
-       $(function() {
-               $("#dialog").dialog({
-                       shadow: true
-               });
-       });
-       </script>
-</head>
-<body>
-
-<div id="dialog" title="Dialog Title">
-       <p> Dialog Content </p>
-</div>
-
-</body>
-</html>
diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js
index c757be8a4c925ae644ccafa5eb06e66cb03d8d22..1edfee15d54d118a21b078cd35407e87fd915b06 100644 (file)
--- a/ui/ui.dialog.js
+++ b/ui/ui.dialog.js
@@ -142,7 +142,6 @@ $.widget("ui.dialog", {
 
        destroy: function() {
                (this.overlay && this.overlay.destroy());
-               (this.shadow && this._destroyShadow());
                this.uiDialog.hide();
                this.element
                        .unbind('.dialog')
@@ -160,7 +159,6 @@ $.widget("ui.dialog", {
                }
 
                (this.overlay && this.overlay.destroy());
-               (this.shadow && this._destroyShadow());
                this.uiDialog
                        .hide(this.options.hide)
                        .unbind('keypress.ui-dialog');
@@ -189,7 +187,6 @@ $.widget("ui.dialog", {
                        maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10) || options.zIndex);
                });
                (this.overlay && this.overlay.$el.css('z-index', ++maxZ));
-               (this.shadow && this.shadow.css('z-index', ++maxZ));
 
                //Save and then restore scroll since Opera 9.5+ resets when parent z-Index is changed.
                //  http://ui.jquery.com/bugs/ticket/3193
@@ -210,7 +207,6 @@ $.widget("ui.dialog", {
                this._size();
                this._position(options.position);
                uiDialog.show(options.show);
-               (options.shadow && this._createShadow());
                this.moveToTop(true, event);
 
                // prevent tabbing out of modal dialogs
@@ -307,12 +303,10 @@ $.widget("ui.dialog", {
                        },
                        drag: function() {
                                (options.drag && options.drag.apply(self.element[0], arguments));
-                               self._refreshShadow();
                        },
                        stop: function() {
                                (options.dragStop && options.dragStop.apply(self.element[0], arguments));
                                $.ui.dialog.overlay.resize();
-                               self._refreshShadow();
                        }
                });
        },
@@ -338,13 +332,11 @@ $.widget("ui.dialog", {
                        },
                        resize: function() {
                                (options.resize && options.resize.apply(self.element[0], arguments));
-                               self._refreshShadow();
                        },
                        handles: resizeHandles,
                        stop: function() {
                                (options.resizeStop && options.resizeStop.apply(self.element[0], arguments));
                                $.ui.dialog.overlay.resize();
-                               self._refreshShadow();
                        }
                })
                .find('.ui-resizable-se').addClass('ui-icon ui-icon-grip-diagonal-se');
@@ -435,11 +427,6 @@ $.widget("ui.dialog", {
                                // currently non-resizable, becoming resizable
                                (isResizable || this._makeResizable(value));
                                break;
-                       case "shadow":
-                               (value
-                                       ? this.shadow || this._createShadow()
-                                       : this.shadow && this._destroyShadow());
-                               break;
                        case "title":
                                $(".ui-dialog-title", this.uiDialogTitlebar).html(value || '&nbsp;');
                                break;
@@ -479,30 +466,6 @@ $.widget("ui.dialog", {
                                        ? 'auto'
                                        : options.height - nonContentHeight
                        });
-       },
-       
-       _createShadow: function() {
-               this.shadow = $('<div class="ui-widget-shadow"></div>').css('position', 'absolute').appendTo(document.body);
-               this._refreshShadow();
-               return this.shadow;
-       },
-       
-       _refreshShadow: function() {
-               if (!this.options.shadow) { return; }
-               
-               var uiDialog = this.uiDialog,
-                       offset = uiDialog.offset();
-               this.shadow.css({
-                       left: offset.left,
-                       top: offset.top,
-                       width: uiDialog.outerWidth(),
-                       height: uiDialog.outerHeight()
-               });
-       },
-       
-       _destroyShadow: function() {
-               this.shadow.remove();
-               this.shadow = null;
        }
 });
 
@@ -522,7 +485,6 @@ $.extend($.ui.dialog, {
                modal: false,
                position: 'center',
                resizable: true,
-               shadow: false,
                stack: true,
                title: '',
                width: 300,
The official jQuery user interface library: https://github.com/jquery/jquery-ui