Modified test for load(); added fix for trigger, where it modifies data passed to...

diff --git a/build/test/data/test.html b/build/test/data/test.html
index cdae2467f77879ffc1ad4ea25b37ce6a1761e1e6..9d5b670bff5055abecee1102385889743f50523a 100644 (file)
--- a/build/test/data/test.html
+++ b/build/test/data/test.html
@@ -1,4 +1,6 @@
 html text<br/>
-<script type="text/javascript">foo = "foo";</script>
+<script type="text/javascript">/* <![CDATA[ */
+foo = "foo"; $('#foo').html('foo');
+/* ]]> */</script>
 <script src="data/test.js"></script>
 blabla
\ No newline at end of file

diff --git a/build/test/data/test.js b/build/test/data/test.js
index 2764fe107a934d883bd5654ad4c45fcab4ce3319..9294f06b76bad291aac5e3e03c7d67fbf9fb31ff 100644 (file)
--- a/build/test/data/test.js
+++ b/build/test/data/test.js
@@ -1 +1,2 @@
 foobar = "bar";\r
+$('#ap').html('bar');\r

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 2ed5396076fd0811ac3479d28eb79cdd146fe6df..ecc0c643514350b121717a7a5528cb470ff8fe7a 100644 (file)
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -51,6 +51,8 @@ jQuery.fn.extend({
         * window.foo = undefined;
         * var verifyEvaluation = function() {
         *   ok( foobar == "bar", 'Check if script src was evaluated after load' );
+        *   ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
+        *   ok( $('#ap').html() == 'bar', 'Check if script evaluation has modified DOM');
         *   start();
         * };
         * $('#first').load('data/test.html', function() {
@@ -62,7 +64,7 @@ jQuery.fn.extend({
         * @name load
         * @type jQuery
         * @param String url The URL of the HTML file to load.
-        * @param Hash params A set of key/value pairs that will be sent to the server.
+        * @param Object params A set of key/value pairs that will be sent to the server.
         * @param Function callback A function to be executed whenever the data is loaded.
         * @cat AJAX
         */

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 430e24f8eb08c113946d96c3c14894d1f12beff5..72596ad7a69f3670a8cf99a8e7f7434a4d9d7d8d 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -2245,8 +2245,8 @@ jQuery.extend({
                },
 
                trigger: function(type,data,element) {
-                       // Touch up the incoming data
-                       data = data || [];
+                       // Clone the incoming data, if any
+                       data = $.merge([], data || []);
 
                        // Handle a global trigger
                        if ( !element ) {