You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/12/26 22:38:20 UTC
svn commit: r1224825 - in /incubator/lcf/branches/CONNECTORS-335:
connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/
connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cm...
Author: kwright
Date: Mon Dec 26 21:38:20 2011
New Revision: 1224825
URL: http://svn.apache.org/viewvc?rev=1224825&view=rev
Log:
Refine the new javascript body method, according to what my tests showed was necessary.
Modified:
incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html
incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.js
incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.js
incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html
incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.js
incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.js
incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.js
incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.js
incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_en_US.js
incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja_JP.js
incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_en_US.js
incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja_JP.js
incubator/lcf/branches/CONNECTORS-335/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/util/Encoder.java
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.html Mon Dec 26 21:38:20 2011
@@ -87,6 +87,7 @@
</table>
<script type="text/javascript">
+<!--
var protocol = "${PROTOCOL:BJ}";
var protocolSelect = document.getElementById("protocol");
if(protocol=="https"){
@@ -94,4 +95,5 @@ if(protocol=="https"){
} else {
protocolSelect.options[0].selected = true;
}
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editConfiguration_en_US.js Mon Dec 26 21:38:20 2011
@@ -66,5 +66,5 @@ function checkConfigForSave()
}
return true;
}
--->
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/editSpecification_en_US.js Mon Dec 26 21:38:20 2011
@@ -28,5 +28,5 @@ function SpecOp(n, opValue, anchorvalue)
eval("editjob."+n+".value = \""+opValue+"\"");
postFormSetAnchor(anchorvalue);
}
--->
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/alfresco/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/alfresco/viewConfiguration_en_US.html Mon Dec 26 21:38:20 2011
@@ -50,6 +50,3 @@
</td>
</tr>
</table>
-
-<script type="text/javascript">
-</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.html Mon Dec 26 21:38:20 2011
@@ -108,7 +108,7 @@
</nobr>
</td>
<td class="value">
- <input type="text" id="repositoryId" name="repositoryId" value="" />
+ <input type="text" id="repositoryId" name="repositoryId" value="${REPOSITORYID:A}" />
<nobr>
(optional)
</nobr>
@@ -117,20 +117,13 @@
</table>
<script type="text/javascript">
+<!--
var binding = "${BINDING:BJ}";
if(binding=="ws"){
var bindingSelect = document.getElementById("binding");
bindingSelect.options[1].selected = true;
}
-var repositoryId = "${REPOSITORYID:BJ}";
-var repositoryIdField = document.getElementById("repositoryId");
-if(repositoryId!=null && repositoryId!="" && repositoryId!=undefined){
- repositoryIdField.value = repositoryId;
-} else {
- repositoryIdField.value = "";
-}
-
var protocol = "${PROTOCOL:BJ}";
var protocolSelect = document.getElementById("protocol");
if(protocol=="https"){
@@ -138,5 +131,5 @@ if(protocol=="https"){
} else {
protocolSelect.options[0].selected = true;
}
-
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_en_US.js Mon Dec 26 21:38:20 2011
@@ -70,5 +70,5 @@ function checkConfigForSave()
}
return true;
}
--->
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.html Mon Dec 26 21:38:20 2011
@@ -75,7 +75,7 @@
</nobr>
</td>
<td class="value">
- <input type="text" id="repositoryId" name="repositoryId" value="" />
+ <input type="text" id="repositoryId" name="repositoryId" value="{REPOSITORYID:A}" />
<nobr>
ï¼ä»»æï¼
</nobr>
@@ -84,20 +84,13 @@
</table>
<script type="text/javascript">
+<!--
var binding = "${BINDING:BJ}";
if(binding=="ws"){
var bindingSelect = document.getElementById("binding");
bindingSelect.options[1].selected = true;
}
-var repositoryId = "${REPOSITORYID:BJ}";
-var repositoryIdField = document.getElementById("repositoryId");
-if(repositoryId!=null && repositoryId!="" && repositoryId!=undefined){
- repositoryIdField.value = repositoryId;
-} else {
- repositoryIdField.value = "";
-}
-
var protocol = "${PROTOCOL:BJ}";
var protocolSelect = document.getElementById("protocol");
if(protocol=="https"){
@@ -105,5 +98,5 @@ if(protocol=="https"){
} else {
protocolSelect.options[0].selected = true;
}
-
+//-->
</script>
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editConfiguration_ja_JP.js Mon Dec 26 21:38:20 2011
@@ -75,5 +75,5 @@ function checkConfigForSave()
}
return true;
}
--->
+//-->
</script>
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_en_US.js Mon Dec 26 21:38:20 2011
@@ -28,5 +28,5 @@ function SpecOp(n, opValue, anchorvalue)
eval("editjob."+n+".value = \""+opValue+"\"");
postFormSetAnchor(anchorvalue);
}
--->
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/cmis/connector/src/main/resource/org/apache/manifoldcf/crawler/connectors/cmis/editSpecification_ja_JP.js Mon Dec 26 21:38:20 2011
@@ -28,5 +28,5 @@ function SpecOp(n, opValue, anchorvalue)
eval("editjob."+n+".value = \""+opValue+"\"");
postFormSetAnchor(anchorvalue);
}
--->
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_en_US.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_en_US.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_en_US.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_en_US.js Mon Dec 26 21:38:20 2011
@@ -38,5 +38,5 @@ function checkConfig() {
function checkConfigForSave() {
return checkConfig();
}
--->
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja_JP.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja_JP.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja_JP.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration_ja_JP.js Mon Dec 26 21:38:20 2011
@@ -38,5 +38,5 @@ function checkConfig() {
function checkConfigForSave() {
return checkConfig();
}
--->
+//-->
</script>
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_en_US.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_en_US.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_en_US.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_en_US.js Mon Dec 26 21:38:20 2011
@@ -17,5 +17,5 @@
<script type="text/javascript">
<!--
--->
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja_JP.js
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja_JP.js?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja_JP.js (original)
+++ incubator/lcf/branches/CONNECTORS-335/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications_ja_JP.js Mon Dec 26 21:38:20 2011
@@ -17,5 +17,5 @@
<script type="text/javascript">
<!--
--->
+//-->
</script>
\ No newline at end of file
Modified: incubator/lcf/branches/CONNECTORS-335/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/util/Encoder.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-335/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/util/Encoder.java?rev=1224825&r1=1224824&r2=1224825&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-335/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/util/Encoder.java (original)
+++ incubator/lcf/branches/CONNECTORS-335/framework/ui-core/src/main/java/org/apache/manifoldcf/ui/util/Encoder.java Mon Dec 26 21:38:20 2011
@@ -65,7 +65,10 @@ public class Encoder
else
rval.append(x);
}
- return bodyEscape(rval.toString());
+ // Body escaping does not seem to be necessary inside <script></script>
+ // blocks, at least when <!-- and //--> surround it.
+ //return bodyEscape(rval.toString());
+ return rval.toString();
}
/** Escape a string that's inside an html attribute.