Modified test for load(); added fix for trigger, where it modifies data passed to it, which causes ugly side-effects

4 files changed, 9 insertions, 4 deletions

diff --git a/build/test/data/test.html b/build/test/data/test.html
index cdae2467f..9d5b670bf 100644
--- 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 2764fe107..9294f06b7 100644
--- a/build/test/data/test.js
+++ b/build/test/data/test.js
@@ -1 +1,2 @@
 foobar = "bar";

+$('#ap').html('bar');

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 2ed539607..ecc0c6435 100644
--- 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 430e24f8e..72596ad7a 100644
--- 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 ) {