@@ -12,7 +12,14 @@ test( "$.widget.extend()", function() {
12
12
deep2copy = { foo : { baz : true } , foo2 : document } ,
13
13
deepmerged = { foo : { bar : true , baz : true } , foo2 : document } ,
14
14
arr = [ 1 , 2 , 3 ] ,
15
- nestedarray = { arr : arr } ;
15
+ nestedarray = { arr : arr } ,
16
+ defaults = { xnumber1 : 5 , xnumber2 : 7 , xstring1 : "peter" , xstring2 : "pan" } ,
17
+ defaultsCopy = { xnumber1 : 5 , xnumber2 : 7 , xstring1 : "peter" , xstring2 : "pan" } ,
18
+ options1 = { xnumber2 : 1 , xstring2 : "x" } ,
19
+ options1Copy = { xnumber2 : 1 , xstring2 : "x" } ,
20
+ options2 = { xstring2 : "xx" , xxx : "newstringx" } ,
21
+ options2Copy = { xstring2 : "xx" , xxx : "newstringx" } ,
22
+ merged2 = { xnumber1 : 5 , xnumber2 : 1 , xstring1 : "peter" , xstring2 : "xx" , xxx : "newstringx" } ;
16
23
17
24
$ . widget . extend ( settings , options ) ;
18
25
deepEqual ( settings , merged , "Check if extended: settings must be extended" ) ;
@@ -79,14 +86,6 @@ test( "$.widget.extend()", function() {
79
86
$ . widget . extend ( obj , { foo :"notnull" } ) ;
80
87
equal ( obj . foo , "notnull" , "Make sure a null value can be overwritten" ) ;
81
88
82
- var defaults = { xnumber1 : 5 , xnumber2 : 7 , xstring1 : "peter" , xstring2 : "pan" } ,
83
- defaultsCopy = { xnumber1 : 5 , xnumber2 : 7 , xstring1 : "peter" , xstring2 : "pan" } ,
84
- options1 = { xnumber2 : 1 , xstring2 : "x" } ,
85
- options1Copy = { xnumber2 : 1 , xstring2 : "x" } ,
86
- options2 = { xstring2 : "xx" , xxx : "newstringx" } ,
87
- options2Copy = { xstring2 : "xx" , xxx : "newstringx" } ,
88
- merged2 = { xnumber1 : 5 , xnumber2 : 1 , xstring1 : "peter" , xstring2 : "xx" , xxx : "newstringx" } ;
89
-
90
89
settings = $ . widget . extend ( { } , defaults , options1 , options2 ) ;
91
90
deepEqual ( settings , merged2 , "Check if extended: settings must be extended" ) ;
92
91
deepEqual ( defaults , defaultsCopy , "Check if not modified: options1 must not be modified" ) ;
0 commit comments