Author: musachy
Date: Tue Jun 12 10:55:36 2007
New Revision: 546575
URL: http://svn.apache.org/viewvc?view=rev&rev=546575
Log:
* Remove last references to Dojo
* Remove unused file (TimePicker-1.txt)
Removed:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TimePicker-1.txt
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/utils.js
struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
Modified:
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/utils.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/utils.js?view=diff&rev=546575&r1=546574&r2=546575
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/utils.js
(original)
+++
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/utils.js
Tue Jun 12 10:55:36 2007
@@ -64,7 +64,7 @@
return StrutsUtils.nextElement(node, tagName);
}
return node;
-}
+};
StrutsUtils.previousElement = function(node, tagName) {
if(!node) { return null; }
@@ -77,4 +77,24 @@
return StrutsUtils.previousElement(node, tagName);
}
return node;
-}
+};
+
+StrutsUtils.addOnLoad = function(func) {
+ var oldonload = window.onload;
+ if (typeof window.onload != 'function') {
+ window.onload = func;
+ } else {
+ window.onload = function() {
+ oldonload();
+ func();
+ }
+ }
+};
+
+StrutsUtils.addEventListener = function(element, name, observer, capture) {
+ if (element.addEventListener) {
+ element.addEventListener(name, observer, false);
+ } else if (element.attachEvent) {
+ element.attachEvent('on' + name, observer);
+ }
+};
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl?view=diff&rev=546575&r1=546574&r2=546575
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
Tue Jun 12 10:55:36 2007
@@ -6,12 +6,11 @@
Enable auto-select of optiontransferselect tag's entries upon containing
form's
submission.
-->
-dojo.require("dojo.event.*");
<#if (parameters.optiontransferselectIds?if_exists?size > 0)>
var containingForm = document.getElementById("${parameters.id}");
<#assign selectObjIds = parameters.optiontransferselectIds.keySet() />
<#list selectObjIds as selectObjectId>
- dojo.event.connect(containingForm, "onsubmit",
+ StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var selectObj =
document.getElementById("${selectObjectId}");
<#if
parameters.optiontransferselectIds.get(selectObjectId)?exists>
@@ -20,14 +19,14 @@
<#else>
selectAllOptionsExceptSome(selectObj,
"key", "");
</#if>
- });
+ }, true);
</#list>
</#if>
<#if (parameters.inputtransferselectIds?if_exists?size > 0)>
var containingForm = document.getElementById("${parameters.id}");
<#assign selectObjIds = parameters.inputtransferselectIds.keySet() />
<#list selectObjIds as selectObjectId>
- dojo.event.connect(containingForm, "onsubmit",
+ StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var selectObj =
document.getElementById("${selectObjectId}");
<#if
parameters.inputtransferselectIds.get(selectObjectId)?exists>
@@ -36,14 +35,14 @@
<#else>
selectAllOptionsExceptSome(selectObj,
"key", "");
</#if>
- });
+ }, true);
</#list>
</#if>
<#if (parameters.optiontransferselectDoubleIds?if_exists?size > 0)>
var containingForm = document.getElementById("${parameters.id}");
<#assign selectDoubleObjIds =
parameters.optiontransferselectDoubleIds.keySet() />
<#list selectDoubleObjIds as selectObjId>
- dojo.event.connect(containingForm, "onsubmit",
+ StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var selectObj =
document.getElementById("${selectObjId}");
<#if
parameters.optiontransferselectDoubleIds.get(selectObjId)?exists>
@@ -52,7 +51,7 @@
<#else>
selectAllOptionsExceptSome(selectObj,
"key", "");
</#if>
- });
+ }, true);
</#list>
</#if>
@@ -65,7 +64,7 @@
var containingForm = document.getElementById("${parameters.id}");
<#assign tmpIds = parameters.updownselectIds.keySet() />
<#list tmpIds as tmpId>
- dojo.event.connect(containingForm, "onsubmit",
+ StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var updownselectObj =
document.getElementById("${tmpId}");
<#if
parameters.updownselectIds.get(tmpId)?exists>
@@ -74,7 +73,7 @@
<#else>
selectAllOptionsExceptSome(updownselectObj, "key", "");
</#if>
- });
+ }, true);
</#list>
</#if>
</script>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl?view=diff&rev=546575&r1=546574&r2=546575
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/head.ftl Tue
Jun 12 10:55:36 2007
@@ -0,0 +1 @@
+<script language="JavaScript" src="${base}/struts/utils.js"
type="text/javascript"></script>
\ No newline at end of file
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt?view=diff&rev=546575&r1=546574&r2=546575
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
Tue Jun 12 10:55:36 2007
@@ -21,11 +21,10 @@
<script type="text/javascript">
- dojo.require("dojo.event.*");
var containingForm = document.getElementById("myAction");
- dojo.event.connect(containingForm, "onsubmit",
+ StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var updownselectObj =
document.getElementById("myAction_myUpDownSelectTag");
selectAllOptionsExceptSome(updownselectObj,
"key", "");
- });
+ }, true);
</script>
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt?view=diff&rev=546575&r1=546574&r2=546575
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
Tue Jun 12 10:55:36 2007
@@ -21,13 +21,12 @@
<script type="text/javascript">
- dojo.require("dojo.event.*");
var containingForm = document.getElementById("myAction");
- dojo.event.connect(containingForm, "onsubmit",
+ StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var updownselectObj =
document.getElementById("myAction_myUpDownSelectTag");
selectAllOptionsExceptSome(updownselectObj,
"key", "");
- });
+ }, true);
</script>
<script type="text/javascript">
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt?view=diff&rev=546575&r1=546574&r2=546575
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
Tue Jun 12 10:55:36 2007
@@ -19,11 +19,10 @@
<script type="text/javascript">
- dojo.require("dojo.event.*");
var containingForm = document.getElementById("myAction");
- dojo.event.connect(containingForm, "onsubmit",
+ StrutsUtils.addEventListener(containingForm, "submit",
function(evt) {
var updownselectObj =
document.getElementById("myAction_myUpDownSelectTag");
selectAllOptionsExceptSome(updownselectObj,
"key", "");
- });
+ }, true);
</script>
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt?view=diff&rev=546575&r1=546574&r2=546575
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/HeadTagTest-1.txt
Tue Jun 12 10:55:36 2007
@@ -1 +1,2 @@
-<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
\ No newline at end of file
+<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
+<script language="JavaScript" src="/struts/utils.js"
type="text/javascript"></script>
\ No newline at end of file
