Dialog: Verify that we get a string back from .attr( "title" ) before using the retur...

diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 97a5d44cd012120f12f04b758efc7f5b0980c51f..d8260cc9f981c44ececd07aabc575aa4f328784e 100644 (file)
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -19,6 +19,7 @@
        <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
        <script type="text/javascript" src="../../../external/qunit.js"></script>
        <script type="text/javascript" src="../../jquery.simulate.js"></script>
+       <script type="text/javascript" src="../testsuite.js"></script>
        
        <script type="text/javascript" src="dialog_core.js"></script>
        <script type="text/javascript" src="dialog_defaults.js"></script>

diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 5fb5f1007e9e43a1016c36b9c723c1390c69bda9..46f93166989e39d7dbb6713b09acd4408dd9dcf5 100644 (file)
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -49,6 +49,10 @@ $.widget("ui.dialog", {
        },
        _create: function() {
                this.originalTitle = this.element.attr('title');
+               // #5742 - .attr() might return a DOMElement
+               if ( typeof this.originalTitle !== "string" ) {
+                       this.originalTitle = "";
+               }
 
                var self = this,
                        options = self.options,