mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
reverting back to dojo 0.3.1 from the nightly - still requires more testing to make sure i haven't broken anything but the nightly was unstable and i feel more comfortable on the released version.
extracting dojo from 3rd-party so it's no longer cluttering up the source tree and putting it in source/web/scripts/ajax/dojo instead of source/web/scripts/ajax playing around with some dojo effects for delete - fixed a bug when deleting the last repeat instance removing some no longer used files (dojogenerator and dwr.jar) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,76 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2005 Alfresco, Inc.
|
||||
*
|
||||
* Licensed under the Mozilla Public License version 1.1
|
||||
* with a permitted attribution clause. You may obtain a
|
||||
* copy of the License at
|
||||
*
|
||||
* http://www.alfresco.org/legal/license.txt
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
|
||||
* either express or implied. See the License for the specific
|
||||
* language governing permissions and limitations under the
|
||||
* License.
|
||||
*/
|
||||
package org.alfresco.web.templating.xforms;
|
||||
|
||||
import org.chiba.tools.xslt.UIGenerator;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Node;
|
||||
import java.io.Writer;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import javax.servlet.*;
|
||||
import javax.servlet.http.*;
|
||||
import java.io.*;
|
||||
import org.chiba.xml.xforms.exception.XFormsException;
|
||||
|
||||
public class DojoGenerator
|
||||
implements UIGenerator
|
||||
{
|
||||
|
||||
private Node inputNode;
|
||||
private final HashMap parameters = new HashMap();
|
||||
private final HttpServletRequest request;
|
||||
private final HttpServletResponse response;
|
||||
|
||||
public DojoGenerator(HttpServletRequest request,
|
||||
HttpServletResponse response)
|
||||
{
|
||||
this.request = request;
|
||||
this.response = response;
|
||||
}
|
||||
|
||||
public void setInputNode(final Node inputNode)
|
||||
{
|
||||
this.inputNode = inputNode;
|
||||
}
|
||||
|
||||
public void setParameter(final String key, final Object value)
|
||||
{
|
||||
this.parameters.put(key, value);
|
||||
}
|
||||
|
||||
public void setOutput(Object output)
|
||||
{
|
||||
// this.output = output;
|
||||
}
|
||||
|
||||
public void generate()
|
||||
throws XFormsException
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
request.setAttribute("xform", this.inputNode);
|
||||
final RequestDispatcher rd = request.getRequestDispatcher("/jsp/content/xforms/dojo-generator.jsp");
|
||||
rd.include(request, response);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new XFormsException(e);
|
||||
}
|
||||
}
|
||||
}
|
@@ -86,7 +86,7 @@ public class XFormsInputMethod
|
||||
final String[] scripts =
|
||||
{
|
||||
"/scripts/tiny_mce/tiny_mce_src.js",
|
||||
"/scripts/ajax/dojo.js",
|
||||
"/scripts/ajax/dojo/dojo.js",
|
||||
"/scripts/ajax/xforms.js"
|
||||
};
|
||||
|
||||
|
@@ -1259,7 +1259,7 @@ public final class Utils
|
||||
// write out the scripts
|
||||
out.write("\n<script type=\"text/javascript\" src=\"");
|
||||
out.write(context.getExternalContext().getRequestContextPath());
|
||||
out.write("/scripts/ajax/dojo.js\"> </script>\n");
|
||||
out.write("/scripts/ajax/dojo/dojo.js\"> </script>\n");
|
||||
out.write("<script type=\"text/javascript\" src=\"");
|
||||
out.write(context.getExternalContext().getRequestContextPath());
|
||||
out.write("/scripts/ajax/common.js\"> </script>\n");
|
||||
|
Reference in New Issue
Block a user