You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/12/12 09:12:23 UTC

git commit: WICKET-4881 IE 8 : error when handling Wicket Ajax Response

Updated Branches:
  refs/heads/master cbf76d0e8 -> afac86377


WICKET-4881 IE 8 : error when handling Wicket Ajax Response

Update the test expectations.
Now all JS scripts are wrapped in: (function() {....})()) to prevent variables' shadowing.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/afac8637
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/afac8637
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/afac8637

Branch: refs/heads/master
Commit: afac8637754579915a935869e13bf9291884d427
Parents: cbf76d0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Dec 12 10:10:25 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Dec 12 10:10:25 2012 +0200

----------------------------------------------------------------------
 .../apache/wicket/TestDetachPageAjaxResult.html    |    2 +-
 .../AjaxHeaderContributionPage2_ajax_expected.html |    2 +-
 .../AjaxHeaderContributionPage_ajax_expected.html  |    2 +-
 .../ajax/DomReadyOrderPage_ajax_expected.html      |    2 +-
 .../SimpleTestPageExpectedResult-1.html            |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/afac8637/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
index 447b4cf..daae08d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
@@ -12,4 +12,4 @@ Wicket.Ajax.DebugWindow.enabled=true;
 Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-comp";
 /*]^]^>*/
 </script>
-</head>]]></header-contribution><evaluate><![CDATA[Wicket.Ajax.ajax({"u":"./page?0-1.IBehaviorListener.0-comp","e":"click","c":"comp1"});]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"u":"./page?0-1.IBehaviorListener.0-comp","e":"click","c":"comp1"});})();]]></evaluate></ajax-response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/afac8637/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
index a2d2af0..7f571f8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
@@ -18,4 +18,4 @@ test
 
 <link href="../test2"/>
 <script type="text/javascript" src="../javascripturlB"></script>
-</head>]]></header-contribution><priority-evaluate><![CDATA[prepend();]]></priority-evaluate><evaluate><![CDATA[domReady();]]></evaluate><evaluate><![CDATA[domReadyB();]]></evaluate><evaluate><![CDATA[append();]]></evaluate><evaluate><![CDATA[onLoad();]]></evaluate><evaluate><![CDATA[onLoadB();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><priority-evaluate><![CDATA[(function(){prepend();})();]]></priority-evaluate><evaluate><![CDATA[(function(){domReady();})();(function(){domReadyB();})();(function(){append();})();(function(){onLoad();})();(function(){onLoadB();})();]]></evaluate></ajax-response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/afac8637/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
index 2e16f76..04b0d57 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_ajax_expected.html
@@ -9,4 +9,4 @@ test
 <script type="text/javascript" src="../javascripturl"></script>
 <script type="text/javascript" src="./resource/org.apache.wicket.resource.JQueryResourceReference/jquery/jquery.js"></script>
 <script type="text/javascript" src="./resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/res/js/wicket-event-jquery.js"></script>
-</head>]]></header-contribution><priority-evaluate><![CDATA[prepend();]]></priority-evaluate><evaluate><![CDATA[domReady();]]></evaluate><evaluate><![CDATA[append();]]></evaluate><evaluate><![CDATA[onLoad();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><priority-evaluate><![CDATA[(function(){prepend();})();]]></priority-evaluate><evaluate><![CDATA[(function(){domReady();})();(function(){append();})();(function(){onLoad();})();]]></evaluate></ajax-response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/afac8637/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
index 4c6836a..a35bf0e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
@@ -12,4 +12,4 @@ Wicket.Ajax.DebugWindow.enabled=true;
 Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-test";
 /*]^]^>*/
 </script>
-</head>]]></header-contribution><evaluate><![CDATA[test1();]]></evaluate><evaluate><![CDATA[test2();]]></evaluate><evaluate><![CDATA[Wicket.Ajax.ajax({"u":"./page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){test1();})();(function(){test2();})();(function(){Wicket.Ajax.ajax({"u":"./page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});})();]]></evaluate></ajax-response>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/afac8637/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
index b58a5fc..da1dbd3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
@@ -17,4 +17,4 @@ Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-testPanel-baseSpan-linj
 if (typeof(Wicket.TimerHandles) === 'undefined') {Wicket.TimerHandles = {}}
 /*]^]^>*/
 </script>
-</head>]]></header-contribution><evaluate encoding="wicket1"><![CDATA[Wicket.TimerHandles['linja11']^ = setTimeout('Wicket.Ajax.ajax({\"u\":\"./page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1\",\"c\":\"linja11\"});', 2000)]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate encoding="wicket1"><![CDATA[(function(){Wicket.TimerHandles['linja11']^ = setTimeout('Wicket.Ajax.ajax({\"u\":\"./page?0-1.IBehaviorListener.0-testPanel-baseSpan-linja1\",\"c\":\"linja11\"});', 2000)})();]]></evaluate></ajax-response>
\ No newline at end of file