You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2010/09/10 22:28:00 UTC
svn commit: r995969 - in
/sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling:
explorer/js/explorer.js servlet/default/explorer/edit.esp
servlet/default/explorer/explorer.esp servlet/default/explorer/properties.esp
Author: justin
Date: Fri Sep 10 20:28:00 2010
New Revision: 995969
URL: http://svn.apache.org/viewvc?rev=995969&view=rev
Log:
SLING-1751 - overriding $.get and $.post (and $.getJSON) to use Sling.baseurl and adding request.getContextPath() everywhere else
Modified:
sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js
sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/edit.esp
sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/explorer.esp
sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/properties.esp
Modified: sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js?rev=995969&r1=995968&r2=995969&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js (original)
+++ sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/explorer/js/explorer.js Fri Sep 10 20:28:00 2010
@@ -16,6 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+/** replace the default get and post jQuery utility functions */
+(function($) {
+ $.getRaw = $.get;
+ $.getJSONRaw = $.getJSON;
+ $.postRaw = $.post;
+ $.get = function(url, parameters, callback) {
+ return $.getRaw(Sling.baseurl + url, parameters, callback)
+ };
+ $.getJson = function(url, parameters, callback) {
+ return $.getJSONRaw(Sling.baseurl + url, parameters, callback)
+ };
+ $.post = function(url, parameters, callback) {
+ return $.postRaw(Sling.baseurl + url, parameters, callback)
+ };
+})(jQuery);
/** load the initial tree on editor startup */
init_load = function(path, resourceType) {
Modified: sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/edit.esp
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/edit.esp?rev=995969&r1=995968&r2=995969&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/edit.esp (original)
+++ sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/edit.esp Fri Sep 10 20:28:00 2010
@@ -42,13 +42,13 @@
<h2><%= Packages.org.apache.sling.api.resource.ResourceUtil.getName( resource ) %></h2>
<form class="deleteNote" action="<%=path%>" method="post">
<input name=":operation" type="hidden" value="delete">
- <input name=":redirect" type="hidden" value="<%= Packages.org.apache.sling.api.resource.ResourceUtil.getParent(resource) %>.explorer.html">
+ <input name=":redirect" type="hidden" value="<%=request.getContextPath()%><%= Packages.org.apache.sling.api.resource.ResourceUtil.getParent(resource) %>.explorer.html">
<input type="submit" class="button" value="delete this node">
</form>
<div class="clear"></div>
</div>
-<p><a href="<%= path %>.explorer.html"><%=path%></a> <%if(isJcrNode){%>(JCR identifier: <%= currentNode.getIdentifier() %>) <%}%> </p>
+<p><a href="<%= request.getContextPath() %><%= path %>.explorer.html"><%=path%></a> <%if(isJcrNode){%>(JCR identifier: <%= currentNode.getIdentifier() %>) <%}%> </p>
<%
try {
if ( session ) { // currentNode &&
@@ -168,7 +168,7 @@
}
}
%>
- <input name=":redirect" type="hidden" value="<%=path%>.explorer.html">
+ <input name=":redirect" type="hidden" value="<%=request.getContextPath()%><%=path%>.explorer.html">
</fieldset>
</form>
Modified: sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/explorer.esp
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/explorer.esp?rev=995969&r1=995968&r2=995969&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/explorer.esp (original)
+++ sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/explorer.esp Fri Sep 10 20:28:00 2010
@@ -25,19 +25,19 @@
<title>Sling || JCR Explorer</title>
- <link rel="stylesheet" href="/libs/sling/explorer/css/explorer.css" type="text/css"/>
+ <link rel="stylesheet" href="<%= request.getContextPath() %>/libs/sling/explorer/css/explorer.css" type="text/css"/>
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.3/themes/base/jquery-ui.css" type="text/css" media="all" />
<link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />
- <script type="text/javascript" src="/system/sling.js"></script>
+ <script type="text/javascript" src="<%= request.getContextPath() %>/system/sling.js"></script>
- <!-- <script type="text/javascript" src="/libs/sling/explorer/js/jquery-1.4.2.min.js"></script> -->
+ <!-- <script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/explorer/js/jquery-1.4.2.min.js"></script> -->
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
- <script type="text/javascript" src="/libs/sling/explorer/js/jquery-ui.min.js"></script>
- <script type="text/javascript" src="/libs/sling/explorer/js/ui.datetimebox.js"></script>
+ <script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/explorer/js/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/explorer/js/ui.datetimebox.js"></script>
- <script type="text/javascript" src="/libs/sling/explorer/js/explorer.js"></script>
+ <script type="text/javascript" src="<%= request.getContextPath() %>/libs/sling/explorer/js/explorer.js"></script>
</head>
@@ -156,7 +156,7 @@ catch (ex) { }
<p id="login" style="display:none">
You are not currently logged in. To login (use <em>admin/admin</em>
to be allowed to write to the repository), follow
- <a href="system/sling/login" title="Click to Login">this link</a>.
+ <a href="<%= request.getContextPath() %>/system/sling/login" title="Click to Login">this link</a>.
</p>
<!--
Resource resolver user ID: <%= request.resourceResolver.getUserID() %>(<%=request.getAuthType() %>)<br/>
Modified: sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/properties.esp
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/properties.esp?rev=995969&r1=995968&r2=995969&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/properties.esp (original)
+++ sling/trunk/bundles/extensions/explorer/src/main/resources/libs/sling/servlet/default/explorer/properties.esp Fri Sep 10 20:28:00 2010
@@ -25,7 +25,7 @@
%>
<h2><%= Packages.org.apache.sling.api.resource.ResourceUtil.getName(resource) %></h2>
-<p><a href="<%= path %>.explorer.html"><%=path%></a></p>
+<p><a href="<%request.getContextPath()%><%= path %>.explorer.html"><%=path%></a></p>
<div>
<h3>properties</h3>
@@ -51,17 +51,17 @@
}
%>
- <form style="display:inline;margin:0px;" action="<%=path%>" method="post">
+ <form style="display:inline;margin:0px;" action="<%request.getContextPath()%><%=path%>" method="post">
<label><%= id %> [<%= type %>]</label>
<input class="prop_value" name ="<%= id %>" value="<%= val %>" />
- <input name=":redirect" type="hidden" value="<%=path%>.explorer.html">
+ <input name=":redirect" type="hidden" value="<%request.getContextPath()%><%=path%>.explorer.html">
<input type="submit" value="update">
</form>
- <form style="display:inline;margin:0px;" action="<%=path%>" method="post">
+ <form style="display:inline;margin:0px;" action="<%request.getContextPath()%><%=path%>" method="post">
<input type="submit" value="delete">
<input type="hidden" name ="<%= id %>@Delete" value="a" />
- <input name=":redirect" type="hidden" value="<%=path%>.explorer.html">
+ <input name=":redirect" type="hidden" value="<%request.getContextPath()%><%=path%>.explorer.html">
</form>
<br/>
@@ -117,7 +117,7 @@
%>
<div>
<h3>add new node</h3>
- <form action="<%=path%>/*" method="post">
+ <form action="<%request.getContextPath()%><%=path%>/*" method="post">
<table>
<thead class="smallLabel">
<tr>
@@ -135,7 +135,7 @@
</td><td>
<input name="jcr:primaryType" type="text">
</td><td>
- <input name=":redirect" type="hidden" value="<%=path%>/*.explorer.html">
+ <input name=":redirect" type="hidden" value="<%request.getContextPath()%><%=path%>/*.explorer.html">
<input type="submit" value="new node">
</td>
</tr>
@@ -160,7 +160,7 @@
<h3>delete node</h3>
<form action="<%=path%>" method="post">
<input name=":operation" type="hidden" value="delete">
- <input name=":redirect" type="hidden" value="<%= Packages.org.apache.sling.api.resource.ResourceUtil.getParent(resource) %>.explorer.html">
+ <input name=":redirect" type="hidden" value="<%request.getContextPath()%><%= Packages.org.apache.sling.api.resource.ResourceUtil.getParent(resource) %>.explorer.html">
<input type="submit" value="delete this node">
</form>
</div>