Changeset 12526 for branches/2.3/themes/default/js/ui/jquery.ui.dialog.js

Timestamp:

Oct 28, 2011, 3:32:48 PM (12 years ago)

Author:

patdenice

Message:

merge r12525 from trunk to branch 2.3
feature:2487
Update jQuery to 1.6.4 and jQuery UI to 1.8.16

File:

• branches/2.3/themes/default/js/ui/jquery.ui.dialog.js (modified) (8 diffs)

branches/2.3/themes/default/js/ui/jquery.ui.dialog.js

@@ -1 +1 @@
 /*
- * jQuery UI Dialog 1.8.10
+ * jQuery UI Dialog 1.8.16
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
@@ -38 +38 @@
                 minHeight: true,
                 minWidth: true
+        },
+        // support for jQuery 1.3.2 - handle common attrFn methods for dialog
+        attrFn = $.attrFn || {
+                val: true,
+                css: true,
+                html: true,
+                text: true,
+                data: true,
+                width: true,
+                height: true,
+                offset: true,
+                click: true
         };
 
@@ -99 +111 @@
                                 // setting outline to 0 prevents a border on focus in Mozilla
                                 .attr('tabIndex', -1).css('outline', 0).keydown(function(event) {
-                                        if (options.closeOnEscape && event.keyCode &&
+                                        if (options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
                                                 event.keyCode === $.ui.keyCode.ESCAPE) {
                                                 
@@ -295 +307 @@
                 //Save and then restore scroll since Opera 9.5+ resets when parent z-Index is changed.
                 //  http://ui.jquery.com/bugs/ticket/3193
-                saveScroll = { scrollTop: self.element.attr('scrollTop'), scrollLeft: self.element.attr('scrollLeft') };
+                saveScroll = { scrollTop: self.element.scrollTop(), scrollLeft: self.element.scrollLeft() };
                 $.ui.dialog.maxZ += 1;
                 self.uiDialog.css('z-index', $.ui.dialog.maxZ);
@@ -377 +389 @@
                                         props;
                                 var button = $('<button type="button"></button>')
-                                        .attr( props, true )
-                                        .unbind('click')
                                         .click(function() {
                                                 props.click.apply(self.element[0], arguments);
                                         })
                                         .appendTo(uiButtonSet);
+                                // can't use .attr( props, true ) with jQuery 1.3.2.
+                                $.each( props, function( key, value ) {
+                                        if ( key === "click" ) {
+                                                return;
+                                        }
+                                        if ( key in attrFn ) {
+                                                button[ key ]( value );
+                                        } else {
+                                                button.attr( key, value );
+                                        }
+                                });
                                 if ($.fn.button) {
                                         button.button();
@@ -682 +703 @@
 
 $.extend($.ui.dialog, {
-        version: "1.8.10",
+        version: "1.8.16",
 
         uuid: 0,
@@ -728 +749 @@
                         // allow closing by pressing the escape key
                         $(document).bind('keydown.dialog-overlay', function(event) {
-                                if (dialog.options.closeOnEscape && event.keyCode &&
+                                if (dialog.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
                                         event.keyCode === $.ui.keyCode.ESCAPE) {
                                         
@@ -803 +824 @@
                 var scrollWidth,
                         offsetWidth;
-                // handle IE 6
-                if ($.browser.msie && $.browser.version < 7) {
+                // handle IE
+                if ( $.browser.msie ) {
                         scrollWidth = Math.max(
                                 document.documentElement.scrollWidth,