Author: snoopdave
Date: Sun Jul 26 15:35:44 2009
New Revision: 797946
URL: http://svn.apache.org/viewvc?rev=797946&view=rev
Log:
removing dependence on Prototype in these JSPs, there were only a couple of
references; all to the $() selector
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp?rev=797946&r1=797945&r2=797946&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp Sun Jul 26
15:35:44 2009
@@ -50,6 +50,6 @@
<%-- this forces focus to the userName field --%>
<script type="text/javascript">
<!--
- $('userName').focus();
+ document.getElementById('userName').focus();
// -->
</script>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp?rev=797946&r1=797945&r2=797946&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp Sun Jul 26
15:35:44 2009
@@ -106,7 +106,7 @@
<td width="80%">
<input type="submit" name="login" id="login"
value="<s:text name="loginPage.login" />" />
<input type="reset" name="reset" id="reset" value="<s:text
name="loginPage.reset" />"
- onclick="$('j_username').focus()" />
+
onclick="document.getElementById('j_username').focus()" />
</td>
</tr>
@@ -121,11 +121,11 @@
if (document.getElementById) {
if (getCookie("username") != null) {
if (document.getElementById) {
- $("j_username").value = getCookie("username");
- $("j_password").focus();
+ document.getElementById("j_username").value =
getCookie("username");
+ document.getElementById("j_password").focus();
}
} else {
- $("j_username").focus();
+ document.getElementById("j_username").focus();
}
}
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp?rev=797946&r1=797945&r2=797946&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp Sun Jul 26
15:35:44 2009
@@ -160,8 +160,11 @@
var passwordText = document.register['bean.passwordText'].value;
var passwordConfirm = document.register['bean.passwordConfirm'].value;
var userName = document.register['bean.userName'].value;
- var emailAddress = document.register['bean.emailAddress'].value;
- var openIdUrl = document.register['bean.openIdUrl'].value;
+ var emailAddress = document.register['bean.emailAddress'].value;
+ var openIdUrl = "";
+ if (openIdConfig != 'disabled') {
+ openIdUrl = document.register['bean.openIdUrl'].value;
+ }
if (ssoEnabled) {
if (emailAddress) disabled = false;
@@ -175,17 +178,18 @@
} else if (openIdConfig == 'hybrid') {
if (emailAddress && ((passwordText && passwordConfirm) || (openIdUrl))
) disabled = false;
}
+
if ((passwordText || passwordConfirm) && !(passwordText ==
passwordConfirm)) {
- $('readytip').innerHTML = '<s:text
name="userRegister.error.mismatchedPasswords" />';
+ document.getElementById('readytip').innerHTML = '<s:text
name="userRegister.error.mismatchedPasswords" />';
disabled = true;
} else if (disabled) {
- $('readytip').innerHTML = '<s:text name="userRegister.tip.ready" />'
+ document.getElementById('readytip').innerHTML = '<s:text
name="userRegister.tip.ready" />'
} else {
- $('readytip').innerHTML = '<s:text name="userRegister.success.ready"
/>'
+ document.getElementById('readytip').innerHTML = '<s:text
name="userRegister.success.ready" />'
}
- //$('submit').disabled = disabled;
+ document.getElementById('submit').disabled = disabled;
}
-//$('submit').disabled = true;
+document.getElementById('submit').disabled = true;
</script>
Modified:
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp?rev=797946&r1=797945&r2=797946&view=diff
==============================================================================
---
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp
(original)
+++
roller/trunk/apps/weblogger/web/roller-ui/authoring/editors/editor-xinha.jsp
Sun Jul 26 15:35:44 2009
@@ -16,11 +16,12 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/scriptaculous/prototype.js"/>" ></script>
<script type="text/javascript">
function editorCleanup() {
- $('xe_content').value = xinha_editors.xe_content.getHTML().trim();
- $('xe_summary').value = xinha_editors.xe_summary.getHTML().trim();
+ document.getElementById('xe_content').value =
xinha_editors.xe_content.getHTML().trim();
+ document.getElementById('xe_summary').value =
xinha_editors.xe_summary.getHTML().trim();
}
// (preferably absolute) URL (including trailing slash) where Xinha is
installed
