Author: snoopdave
Date: Sun Mar 28 22:16:27 2010
New Revision: 928502
URL: http://svn.apache.org/viewvc?rev=928502&view=rev
Log:
Support for comment editing, also upgrades to JQuery 1.4.2
https://issues.apache.org/jira/browse/ROL-1752
Added:
roller/trunk/weblogger-web/src/main/webapp/roller-ui/scripts/jquery-1.4.2.min.js
Removed:
roller/trunk/weblogger-web/src/main/webapp/roller-ui/scripts/jquery-1.3.1.min.js
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/Utilities.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/Utilities.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/Utilities.java?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/Utilities.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/Utilities.java
Sun Mar 28 22:16:27 2010
@@ -2,11 +2,13 @@ package org.apache.roller.weblogger.util
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -392,6 +394,20 @@ public class Utilities {
copyInputToOutput(in, out, from.length());
}
+ /**
+ * Reads an inputstream into a string
+ */
+ public static String streamToString(InputStream is) throws IOException {
+ StringBuffer sb = new StringBuffer();
+ BufferedReader in = new BufferedReader(new InputStreamReader(is));
+ String line;
+ while ((line = in.readLine()) != null) {
+ sb.append(line);
+ sb.append(System.getProperty("line.separator"));
+ }
+ return sb.toString();
+ }
+
//------------------------------------------------------------------------
/**
* Utility method to copy an input stream to an output stream.
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/ajax/CommentDataServlet.java
Sun Mar 28 22:16:27 2010
@@ -28,17 +28,27 @@ import org.apache.commons.lang.WordUtils
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogEntryManager;
+import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
+import org.apache.roller.weblogger.ui.core.RollerSession;
import org.apache.roller.weblogger.util.Utilities;
/**
- * Return comment id and content in JavaScript Object Notation (JSON) format.
- * For example comment with id "3454545346" and content "hi there" will be
- * represented as: {id : "3454545346", content : "hi there"}
+ * Supports GET of comment data in JSON format and PUT of raw comment content.
*/
public class CommentDataServlet extends HttpServlet {
-
+
+ public void checkAuth(HttpServletRequest request, Weblog weblog) {
+ }
+
+ /**
+ * Accepts request with comment 'id' parameter and returns comment id and
+ * content in JSON format. For example comment with id "3454545346" and
+ * content "hi there" will be represented as:
+ * {id : "3454545346", content : "hi there"}
+ */
public void doGet(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException {
@@ -47,18 +57,83 @@ public class CommentDataServlet extends
try {
WeblogEntryManager wmgr = roller.getWeblogEntryManager();
WeblogEntryComment c = wmgr.getComment(request.getParameter("id"));
- String content = Utilities.escapeHTML(c.getContent());
- content = WordUtils.wrap(content, 72);
- content = StringEscapeUtils.escapeJavaScript(content);
- String json = "{ id: \"" + c.getId() + "\"," + "content: \"" +
content + "\" }";
- response.setContentType("text/html; charset=utf-8");
- response.getWriter().print(json);
- response.flushBuffer();
- response.getWriter().flush();
- response.getWriter().close();
+ if (c == null) {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ } else {
+ // need post permission to view comments
+ RollerSession rses = RollerSession.getRollerSession(request);
+ Weblog weblog = c.getWeblogEntry().getWebsite();
+ if (weblog.hasUserPermission(rses.getAuthenticatedUser(),
WeblogPermission.POST)) {
+ String content = Utilities.escapeHTML(c.getContent());
+ content = WordUtils.wrap(content, 72);
+ content = StringEscapeUtils.escapeJavaScript(content);
+ String json = "{ id: \"" + c.getId() + "\"," + "content:
\"" + content + "\" }";
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.setContentType("text/html; charset=utf-8");
+ response.getWriter().print(json);
+ response.flushBuffer();
+ response.getWriter().flush();
+ response.getWriter().close();
+ } else {
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ }
+ }
+
+ } catch (Exception e) {
+ throw new ServletException(e.getMessage());
+ }
+ }
+
+ /**
+ * Accepts request with comment 'id' parameter and replaces specified
+ * comment's content with the content in the request.
+ */
+ public void doPut(HttpServletRequest request,
+ HttpServletResponse response)
+ throws ServletException, IOException {
+
+ Weblogger roller = WebloggerFactory.getWeblogger();
+ try {
+ WeblogEntryManager wmgr = roller.getWeblogEntryManager();
+ WeblogEntryComment c = wmgr.getComment(request.getParameter("id"));
+ if (c == null) {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ } else {
+ // need post permission to edit comments
+ RollerSession rses = RollerSession.getRollerSession(request);
+ Weblog weblog = c.getWeblogEntry().getWebsite();
+ if (weblog.hasUserPermission(rses.getAuthenticatedUser(),
WeblogPermission.POST)) {
+ String content =
Utilities.streamToString(request.getInputStream());
+ c.setContent(content);
+ wmgr.saveComment(c);
+ roller.flush();
+
+ c = wmgr.getComment(request.getParameter("id"));
+ content = Utilities.escapeHTML(c.getContent());
+ content = WordUtils.wrap(content, 72);
+ content = StringEscapeUtils.escapeJavaScript(content);
+ String json = "{ id: \"" + c.getId() + "\"," + "content:
\"" + content + "\" }";
+ response.setStatus(HttpServletResponse.SC_OK);
+ response.setContentType("text/html; charset=utf-8");
+ response.getWriter().print(json);
+ response.flushBuffer();
+ response.getWriter().flush();
+ response.getWriter().close();
+ response.setStatus(HttpServletResponse.SC_OK);
+ } else {
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ }
+ }
+
} catch (Exception e) {
throw new ServletException(e.getMessage());
}
}
-
+
+ public void doPost(HttpServletRequest request,
+ HttpServletResponse response)
+ throws ServletException, IOException {
+ // not all browsers support PUT
+ doPut(request, response);
+ }
}
Modified:
roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
(original)
+++
roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
Sun Mar 28 22:16:27 2010
@@ -325,7 +325,12 @@ commentManagement.returnToEntry=Return t
commentManagement.select=Select
commentManagement.all=All
commentManagement.none=None
-commentManagement.readmore=View full comment...
+commentManagement.readmore=View Entire Comment
+
+commentManagement.editComment=Edit Comment
+commentManagement.saveComment=Save
+commentManagement.cancelComment=Cancel
+commentManagement.saveError=Error saving comment
# -------------------------------------------------------------- CommentServlet
Modified:
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
(original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
Sun Mar 28 22:16:27 2010
@@ -17,59 +17,20 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
<script type="text/javascript">
<!--
function setChecked(val, name) {
- form = document.getElementById('comments');
- len = form.elements.length;
- var i=0;
- for( i=0 ; i<len ; i++) {
- if (form.elements[i].name == name) {
- form.elements[i].checked=val;
- }
- }
+ $("input[name=" + name + "]").attr('checked', val);
}
+
function bulkDelete() {
if (window.confirm('<s:text
name="commentManagement.confirmBulkDelete"><s:param value="bulkDeleteCount"
/></s:text>')) {
document.commentQueryForm.method.value = "bulkDelete";
document.commentQueryForm.submit();
}
}
-
- function createRequestObject() {
- var ro;
- var browser = navigator.appName;
- if (browser == "Microsoft Internet Explorer") {
- ro = new ActiveXObject("Microsoft.XMLHTTP");
- } else {
- ro = new XMLHttpRequest();
- }
- return ro;
- }
- var http = createRequestObject();
- var init = false;
- var isBusy = false;
-
- function readMoreComment(id) {
- url = "<%=
request.getContextPath()%>/roller-ui/authoring/commentdata?id=" + id;
- if (isBusy) return;
- isBusy = true;
- http.open('get', url);
- http.onreadystatechange = handleCommentResponse;
- http.send(null);
- }
-
- function handleCommentResponse() {
- if (http.readyState == 4) {
- comment = eval("(" + http.responseText + ")");
- commentDiv = document.getElementById("comment-" + comment.id);
- commentDiv.textContent = comment.content;
- linkDiv = document.getElementById("link-" + comment.id);
- linkDiv.parentNode.removeChild(linkDiv);
- }
- isBusy = false;
- }
-->
</script>
@@ -332,7 +293,7 @@
<span class="details">
<s:if test="#comment.content.length() > 1000">
- <pre><div id="comment-<s:property
value="#comment.id"/>"><str:wordWrap width="72"><str:truncateNicely
upper="1000" appendToEnd="..."><s:property value="#comment.content"
escape="true" /></str:truncateNicely></str:wordWrap></div></pre>
+ <span id="comment-<s:property
value="#comment.id"/>"><str:truncateNicely upper="1000"
appendToEnd="..."><s:property value="#comment.content" escape="true"
/></str:truncateNicely></span>
<div id="link-<s:property
value="#comment.id"/>">
<a onclick='readMoreComment("<s:property
value="#comment.id"/>")'>
<s:text
name="commentManagement.readmore" />
@@ -340,9 +301,29 @@
</div>
</s:if>
<s:else>
- <pre><str:wordWrap><s:property
value="#comment.content" escape="true" /></str:wordWrap></pre>
+ <span width="200px" id="comment-<s:property
value="#comment.id"/>"><s:property value="#comment.content" escape="true"
/></span>
</s:else>
+ <br />
+ <br />
+ <div>
+ <a id="editlink-<s:property
value="#comment.id"/>" onclick='editComment("<s:property
value="#comment.id"/>")'>
+ <s:text
name="commentManagement.editComment" />
+ </a>
+ </div>
+
+ <span id="savelink-<s:property
value="#comment.id"/>" style="display: none">
+ <a onclick='saveComment("<s:property
value="#comment.id"/>")'>
+ <s:text
name="commentManagement.saveComment" />
+ </a>
+ </span>
+ |
+ <span id="cancellink-<s:property
value="#comment.id"/>" style="display: none">
+ <a onclick='editCommentCancel("<s:property
value="#comment.id"/>")'>
+ <s:text
name="commentManagement.cancelComment" />
+ </a>
+ </span>
+
</span>
</td>
@@ -351,6 +332,75 @@
</table>
<br />
+
+ <script type="text/javascript">
+ <!--
+ var comments = {};
+
+ function editComment(id) {
+ // make sure we have the full comment
+ if ($("#link-" + id).size() > 0) readMoreComment(id, editComment);
+
+ // save the original comment value
+ comments[id] = $("#comment-" + id).html();
+
+ $("#editlink-" + id).hide();
+ $("#savelink-" + id).show();
+ $("#cancellink-" + id).show();
+
+ // put comment in a textarea for editing
+ $("#comment-" + id).html("<textarea style='width:100%' rows='10'>" +
comments[id] + "</textarea>");
+ }
+
+ function saveComment(id) {
+ var content = $("#comment-" + id).children()[0].value;
+ $.ajax({
+ type: "POST",
+ url: '<%=
request.getContextPath()%>/roller-ui/authoring/commentdata?id=' + id,
+ data: content,
+ dataType: "text",
+ processData: "false",
+ contentType: "text/plain",
+ success: function (rdata) {
+ if (status != "success") {
+ var cdata = eval("(" + rdata + ")");
+ $("#editlink-" + id).show();
+ $("#savelink-" + id).hide();
+ $("#cancellink-" + id).hide();
+ $("#comment-" + id).html(cdata.content);
+ } else {
+ alert('<s:text name="commentManagement.saveError" />');
+ }
+ }
+ });
+ }
+
+ function editCommentCancel(id) {
+ $("#editlink-" + id).show();
+ $("#savelink-" + id).hide();
+ $("#cancellink-" + id).hide();
+ if (comments[id]) {
+ $("#comment-" + id).html(comments[id]);
+ comments[id] = null;
+ }
+ }
+
+ function readMoreComment(id, callback) {
+ $.ajax({
+ type: "GET",
+ url: '<%=
request.getContextPath()%>/roller-ui/authoring/commentdata?id=' + id,
+ success: function(data) {
+ var cdata = eval("(" + data + ")");
+ $("#comment-" + cdata.id).html(cdata.content);
+ $("#link-" + id).detach();
+ if (callback) callback(id);
+ }
+ });
+ }
+ -->
+</script>
+
+
<%-- ========================================================= --%>
<%-- Save changes and cancel buttons --%>
<%-- ========================================================= --%>
Modified:
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
(original)
+++ roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryAdd.jsp
Sun Mar 28 22:16:27 2010
@@ -26,7 +26,7 @@
<script type="text/javascript" src="<s:url
value='/roller-ui/yui/menu/menu-min.js'/>"></script>
<script type="text/javascript" src="<s:url
value='/roller-ui/yui/dragdrop/dragdrop-min.js' />"></script>
-<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.3.1.min.js" />"></script>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
<style>
#tagAutoCompleteWrapper {
Modified:
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
(original)
+++
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
Sun Mar 28 22:16:27 2010
@@ -26,7 +26,7 @@
<script type="text/javascript" src="<s:url
value='/roller-ui/yui/menu/menu-min.js'/>"></script>
<script type="text/javascript" src="<s:url
value='/roller-ui/yui/dragdrop/dragdrop-min.js' />"></script>
-<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.3.1.min.js" />"></script>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
<style>
Modified:
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
(original)
+++
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
Sun Mar 28 22:16:27 2010
@@ -16,7 +16,7 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-1.3.1.min.js" />'></script>
+<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />'></script>
<script type="text/javascript">
Modified:
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
(original)
+++
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
Sun Mar 28 22:16:27 2010
@@ -16,7 +16,7 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.3.1.min.js" />"></script>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
<style type="text/css">
table.mediaFileTable {
Modified:
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
(original)
+++
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
Sun Mar 28 22:16:27 2010
@@ -16,7 +16,7 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-1.3.1.min.js" />'></script>
+<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />'></script>
<s:if test="bean.isImage">
<div class="mediaFileThumbnail">
Modified:
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
(original)
+++
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
Sun Mar 28 22:16:27 2010
@@ -26,7 +26,7 @@
<script type="text/javascript" src="<s:url
value='/roller-ui/yui/menu/menu-min.js'/>"></script>
<script type="text/javascript" src="<s:url
value='/roller-ui/yui/dragdrop/dragdrop-min.js' />"></script>
-<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.3.1.min.js" />"></script>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
<style>
Modified:
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
(original)
+++
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
Sun Mar 28 22:16:27 2010
@@ -26,7 +26,7 @@
<script type="text/javascript" src="<s:url
value='/roller-ui/yui/element/element-min.js' />"></script>
<script type="text/javascript" src="<s:url
value='/roller-ui/yui/button/button-min.js' />"></script>
-<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-1.3.1.min.js" />'></script>
+<script type="text/javascript" src='<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />'></script>
<style>
Modified:
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp?rev=928502&r1=928501&r2=928502&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
(original)
+++
roller/trunk/weblogger-web/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp
Sun Mar 28 22:16:27 2010
@@ -16,7 +16,7 @@
directory of this distribution.
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.3.1.min.js" />"></script>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/jquery-1.4.2.min.js" />"></script>
<script type="text/javascript">
<!--
