inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- working on better error handling - showing some more informative error messages instead of that 500 error thing.

Browse Source 
- attempting to figure out which fields are invalid in order to provide better (and eventually consistent feedback)
- more bug fixes related to dojo downgrade.
- making alternate rows have a different background color.
- fixing up selection logic and reducing redundant setindex calls



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3875 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ariel Backenroth
2006-09-21 17:56:10 +00:00
parent 97ed37f6e3
commit 83fcb2064c
4 changed files with 289 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
source/java/org/alfresco/web/app/servlet/ajax/InvokeCommand.java
View File

@@ -1,3 +1,19 @@
/*
* 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.app.servlet.ajax; package org.alfresco.web.app.servlet.ajax;
import java.io.IOException; import java.io.IOException;
@@ -8,6 +24,7 @@ import javax.faces.FactoryFinder;
import javax.faces.component.UIViewRoot; import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter; import javax.faces.context.ResponseWriter;
import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding; import javax.faces.el.MethodBinding;
import javax.faces.render.RenderKit; import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory; import javax.faces.render.RenderKitFactory;
@@ -34,8 +51,10 @@ import org.alfresco.web.bean.repository.Repository;
*/ */
public class InvokeCommand extends BaseAjaxCommand public class InvokeCommand extends BaseAjaxCommand
{ {
public void execute(FacesContext facesContext, String expression, public void execute(final FacesContext facesContext,
HttpServletRequest request, HttpServletResponse response) final String expression,
final HttpServletRequest request,
final HttpServletResponse response)
throws ServletException, IOException throws ServletException, IOException
{ {
// setup the JSF response writer. // setup the JSF response writer.
@@ -46,19 +65,19 @@ public class InvokeCommand extends BaseAjaxCommand
// In the future we may use annotations on the method to be called to specify what content // In the future we may use annotations on the method to be called to specify what content
// type should be used for the response. // type should be used for the response.
OutputStream os = response.getOutputStream(); final OutputStream os = response.getOutputStream();
UIViewRoot viewRoot = facesContext.getViewRoot(); final UIViewRoot viewRoot = facesContext.getViewRoot();
RenderKitFactory renderFactory = (RenderKitFactory)FactoryFinder. final RenderKitFactory renderFactory = (RenderKitFactory)FactoryFinder.
getFactory(FactoryFinder.RENDER_KIT_FACTORY); getFactory(FactoryFinder.RENDER_KIT_FACTORY);
RenderKit renderKit = renderFactory.getRenderKit(facesContext, final RenderKit renderKit = renderFactory.getRenderKit(facesContext,
viewRoot.getRenderKitId()); viewRoot.getRenderKitId());
ResponseWriter writer = renderKit.createResponseWriter( final ResponseWriter writer = renderKit.createResponseWriter(
new OutputStreamWriter(os), MimetypeMap.MIMETYPE_HTML, "UTF-8"); new OutputStreamWriter(os), MimetypeMap.MIMETYPE_XML, "UTF-8");
facesContext.setResponseWriter(writer); facesContext.setResponseWriter(writer);
response.setContentType(writer.getContentType()); response.setContentType(writer.getContentType());
// create the JSF binding expression // create the JSF binding expression
String bindingExpr = makeBindingExpression(expression); final String bindingExpr = makeBindingExpression(expression);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("Invoking method represented by " + bindingExpr); logger.debug("Invoking method represented by " + bindingExpr);
@@ -67,8 +86,8 @@ public class InvokeCommand extends BaseAjaxCommand
try try
{ {
// create the method binding from the expression // create the method binding from the expression
MethodBinding binding = facesContext.getApplication().createMethodBinding( final MethodBinding binding =
bindingExpr, new Class[] {}); facesContext.getApplication().createMethodBinding(bindingExpr, new Class[] {});
if (binding != null) if (binding != null)
{ {
@@ -86,9 +105,17 @@ public class InvokeCommand extends BaseAjaxCommand
catch (Throwable err) catch (Throwable err)
{ {
// rollback the transaction // rollback the transaction
try { if (tx != null) {tx.rollback();} } catch (Exception ex) {} try { if (tx != null) { tx.rollback(); } } catch (Exception ex) { }
if (err instanceof EvaluationException)
throw new AlfrescoRuntimeException("Failed to execute method: " + err.getMessage(), err); {
final Throwable cause = ((EvaluationException)err).getCause();
if (cause != null)
err = cause;
}
logger.error(err);
throw new AlfrescoRuntimeException("Failed to execute method " + expression +
": " + err.getMessage(),
err);
} }
// force the output back to the client // force the output back to the client

25
source/java/org/alfresco/web/bean/ajax/XFormsBean.java
View File

@@ -18,6 +18,7 @@ package org.alfresco.web.bean.ajax;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
@@ -118,7 +119,11 @@ public class XFormsBean
this.chibaBean.init(); this.chibaBean.init();
// register for notification events // register for notification events
et.addEventListener(XFormsEventFactory.SUBMIT_DONE, el, true);
et.addEventListener(XFormsEventFactory.SUBMIT_ERROR, el, true); et.addEventListener(XFormsEventFactory.SUBMIT_ERROR, el, true);
et.addEventListener(XFormsEventFactory.REQUIRED, el, true);
et.addEventListener(XFormsEventFactory.INVALID, el, true);
et.addEventListener(XFormsEventFactory.OUT_OF_RANGE, el, true);
et.addEventListener(XFormsEventFactory.CHIBA_STATE_CHANGED, el, true); et.addEventListener(XFormsEventFactory.CHIBA_STATE_CHANGED, el, true);
et.addEventListener(XFormsEventFactory.CHIBA_PROTOTYPE_CLONED, el, true); et.addEventListener(XFormsEventFactory.CHIBA_PROTOTYPE_CLONED, el, true);
et.addEventListener(XFormsEventFactory.CHIBA_ID_GENERATED, el, true); et.addEventListener(XFormsEventFactory.CHIBA_ID_GENERATED, el, true);
@@ -248,6 +253,7 @@ public class XFormsBean
for (XFormsEvent xfe : this.eventLog) for (XFormsEvent xfe : this.eventLog)
{ {
final String type = xfe.getType(); final String type = xfe.getType();
LOGGER.debug("adding event " + type + " to the event log");
final Element target = (Element)xfe.getTarget(); final Element target = (Element)xfe.getTarget();
final Element eventElement = result.createElement(type); final Element eventElement = result.createElement(type);
@@ -255,13 +261,20 @@ public class XFormsBean
eventElement.setAttribute("targetId", target.getAttributeNS(null, "id")); eventElement.setAttribute("targetId", target.getAttributeNS(null, "id"));
eventElement.setAttribute("targetName", target.getLocalName()); eventElement.setAttribute("targetName", target.getLocalName());
for (Object name : xfe.getPropertyNames()) final Collection properties = xfe.getPropertyNames();
if (properties != null)
{ {
final Element propertyElement = result.createElement("property"); for (Object name : properties)
eventElement.appendChild(propertyElement); {
propertyElement.setAttribute("name", (String)name); final Object value = xfe.getContextInfo((String)name);
final String value = xfe.getContextInfo((String)name).toString(); LOGGER.debug("adding property {" + name +
propertyElement.setAttribute("value", value); ":" + value + "} to event " + type);
final Element propertyElement = result.createElement("property");
eventElement.appendChild(propertyElement);
propertyElement.setAttribute("name", name.toString());
propertyElement.setAttribute("value",
value != null ? value.toString() : null);
}
} }
} }
this.eventLog.clear(); this.eventLog.clear();

8
source/java/org/alfresco/web/templating/xforms/TemplateTypeImpl.java
View File

@@ -135,12 +135,12 @@ public class TemplateTypeImpl
{ {
final TemplatingService ts = TemplatingService.getInstance(); final TemplatingService ts = TemplatingService.getInstance();
final Document d = ts.parseXML(new ByteArrayInputStream(xmlString.getBytes())); final Document d = ts.parseXML(new ByteArrayInputStream(xmlString.getBytes()));
System.out.println("sample xml:"); LOGGER.debug("sample xml:");
System.out.println(ts.writeXMLToString(d)); LOGGER.debug(ts.writeXMLToString(d));
TemplateTypeImpl.cleanUpSampleXml(d.getDocumentElement()); TemplateTypeImpl.cleanUpSampleXml(d.getDocumentElement());
System.out.println("cleaned up xml:"); LOGGER.debug("cleaned up xml:");
System.out.println(ts.writeXMLToString(d)); LOGGER.debug(ts.writeXMLToString(d));
return d; return d;
} }
catch (ParserConfigurationException pce) catch (ParserConfigurationException pce)

402
source/web/scripts/ajax/xforms.js
View File

@@ -6,7 +6,6 @@ dojo.require("dojo.widget.ComboBox");
dojo.require("dojo.widget.Checkbox"); dojo.require("dojo.widget.Checkbox");
dojo.require("dojo.widget.Editor"); dojo.require("dojo.widget.Editor");
dojo.require("dojo.widget.Spinner"); dojo.require("dojo.widget.Spinner");
dojo.require("dojo.fx.html");
dojo.require("dojo.lfx.html"); dojo.require("dojo.lfx.html");
dojo.hostenv.writeIncludes(); dojo.hostenv.writeIncludes();
dojo.addOnLoad(function() dojo.addOnLoad(function()
@@ -141,40 +140,44 @@ dojo.declare("alfresco.xforms.DatePicker",
alfresco.xforms.Widget, alfresco.xforms.Widget,
{ {
initializer: function(xform, node) initializer: function(xform, node)
{ {
this.inherited("initializer", [ xform, node ]); this.inherited("initializer", [ xform, node ]);
}, },
render: function(attach_point) render: function(attach_point)
{ {
var initial_value = this.getInitialValue() || dojo.widget.DatePicker.util.toRfcDate(); var initial_value = this.getInitialValue() || dojo.widget.DatePicker.util.toRfcDate();
var dateTextBoxDiv = document.createElement("div"); var dateTextBoxDiv = document.createElement("div");
attach_point.appendChild(dateTextBoxDiv); attach_point.appendChild(dateTextBoxDiv);
this.dateTextBox = dojo.widget.createWidget("DateTextBox", this.dateTextBox = dojo.widget.createWidget("DateTextBox",
{ {
widgetId: this.id + "-widget", widgetId: this.id + "-widget",
required: this.isRequired(), required: this.isRequired(),
format: "YYYY-MM-DD", format: "YYYY-MM-DD",
value: initial_value value: initial_value
}, },
dateTextBoxDiv); dateTextBoxDiv);
dojo.event.connect(this.dateTextBox, dojo.event.connect(this.dateTextBox,
"onfocus", "onfocus",
this, this,
this._dateTextBox_focusHandler); this._dateTextBox_focusHandler);
var datePickerDiv = document.createElement("div"); var datePickerDiv = document.createElement("div");
attach_point.appendChild(datePickerDiv); attach_point.appendChild(datePickerDiv);
this.dateTextBox.picker = dojo.widget.createWidget("DatePicker", this.dateTextBox.picker = dojo.widget.createWidget("DatePicker",
{ {
isHidden: true, isHidden: true,
value : initial_value value : initial_value
}, },
datePickerDiv); datePickerDiv);
this.dateTextBox.picker.hide(); this.dateTextBox.picker.hide();
dojo.event.connect(this.dateTextBox.picker, dojo.event.connect(this.dateTextBox.picker,
"onSetDate", "onSetDate",
this, this,
this._datePicker_setDateHandler); this._datePicker_setDateHandler);
}, },
getValue: function()
{
return this.dateTextBox.getValue();
},
_dateTextBox_focusHandler: function(event) _dateTextBox_focusHandler: function(event)
{ {
this.dateTextBox.hide(); this.dateTextBox.hide();
@@ -189,8 +192,7 @@ dojo.declare("alfresco.xforms.DatePicker",
this.domContainer.style.height = this.domContainer.style.height =
this.dateTextBox.domNode.offsetHeight + "px"; this.dateTextBox.domNode.offsetHeight + "px";
this.dateTextBox.setValue(dojo.widget.DatePicker.util.toRfcDate(this.dateTextBox.picker.date)); this.dateTextBox.setValue(dojo.widget.DatePicker.util.toRfcDate(this.dateTextBox.picker.date));
this.xform.setXFormsValue(this.dateTextBox.widgetId, this.xform.setXFormsValue(this.id, this.getValue());
this.dateTextBox.getValue());
} }
}); });
@@ -198,34 +200,34 @@ dojo.declare("alfresco.xforms.TextField",
alfresco.xforms.Widget, alfresco.xforms.Widget,
{ {
initializer: function(xform, node) initializer: function(xform, node)
{ {
this.inherited("initializer", [ xform, node ]); this.inherited("initializer", [ xform, node ]);
}, },
render: function(attach_point) render: function(attach_point)
{ {
var nodeRef = document.createElement("div"); var nodeRef = document.createElement("div");
attach_point.appendChild(nodeRef); attach_point.appendChild(nodeRef);
var initial_value = this.getInitialValue() || ""; var initial_value = this.getInitialValue() || "";
var w = dojo.widget.createWidget("ValidationTextBox", var w = dojo.widget.createWidget("ValidationTextBox",
{ {
widgetId: this.id + "-widget", widgetId: this.id + "-widget",
required: this.isRequired(), required: this.isRequired(),
value: initial_value value: initial_value
}, },
nodeRef); nodeRef);
w.widget = this; w.widget = this;
this.widget = w; this.widget = w;
dojo.event.connect(w, "onkeyup", this, this._widget_keyUpHandler); dojo.event.connect(w, "onkeyup", this, this._widget_keyUpHandler);
}, },
getValue: function() getValue: function()
{ {
return this.widget.getValue(); return this.widget.getValue();
}, },
_widget_keyUpHandler: function(event) _widget_keyUpHandler: function(event)
{ {
this.xform.setXFormsValue(this.id, this.getValue()); this.xform.setXFormsValue(this.id, this.getValue());
} }
}); });
dojo.declare("alfresco.xforms.TextArea", dojo.declare("alfresco.xforms.TextArea",
@@ -234,7 +236,6 @@ dojo.declare("alfresco.xforms.TextArea",
initializer: function(xform, node) initializer: function(xform, node)
{ {
this.inherited("initializer", [ xform, node ]); this.inherited("initializer", [ xform, node ]);
dojo.debug("created a TextArea");
}, },
render: function(attach_point) render: function(attach_point)
{ {
@@ -260,46 +261,46 @@ dojo.declare("alfresco.xforms.Select1",
alfresco.xforms.Widget, alfresco.xforms.Widget,
{ {
initializer: function(xform, node) initializer: function(xform, node)
{ {
this.inherited("initializer", [ xform, node ]); this.inherited("initializer", [ xform, node ]);
}, },
getValues: function() getValues: function()
{
var binding = this._getBinding();
var values = this.node.getElementsByTagName("item");
var result = [];
for (var v in values)
{ {
var binding = this._getBinding(); if (values[v].getElementsByTagName)
var values = this.node.getElementsByTagName("item");
var result = [];
for (var v in values)
{ {
if (values[v].getElementsByTagName) var label = values[v].getElementsByTagName("label")[0];
var value = values[v].getElementsByTagName("value")[0];
var valid = true;
if (binding.constraint)
{ {
var label = values[v].getElementsByTagName("label")[0]; dojo.debug("testing " + binding.constraint +
var value = values[v].getElementsByTagName("value")[0]; " on " + dojo.dom.textContent(value));
var valid = true; var d = this.node.ownerDocument;
if (binding.constraint) valid = d.evaluate(binding.constraint,
{ value,
dojo.debug("testing " + binding.constraint + d.createNSResolver(d),
" on " + dojo.dom.textContent(value)); XPathResult.ANY_TYPE,
var d = this.node.ownerDocument; null);
valid = d.evaluate(binding.constraint, dojo.debug("valid " + dojo.dom.textContent(value) + "? " + valid);
value, valid = valid.booleanValue;
d.createNSResolver(d), }
XPathResult.ANY_TYPE, if (valid)
null); {
dojo.debug("valid " + dojo.dom.textContent(value) + "? " + valid); result.push({
valid = valid.booleanValue; id: value.getAttribute("id"),
} label: dojo.dom.textContent(label),
if (valid) value: dojo.dom.textContent(value)
{ });
result.push({
id: value.getAttribute("id"),
label: dojo.dom.textContent(label),
value: dojo.dom.textContent(value)
});
}
} }
} }
return result; }
}, return result;
},
render: function(attach_point) render: function(attach_point)
{ {
var values = this.getValues(); var values = this.getValues();
@@ -314,8 +315,8 @@ dojo.declare("alfresco.xforms.Select1",
for (var i in values) for (var i in values)
{ {
var radio = document.createElement("input"); var radio = document.createElement("input");
radio.setAttribute("id", this.id); radio.setAttribute("id", this.id + "-widget");
radio.setAttribute("name", this.id); radio.setAttribute("name", this.id + "-widget");
radio.setAttribute("type", "radio"); radio.setAttribute("type", "radio");
radio.setAttribute("value", values[i].value); radio.setAttribute("value", values[i].value);
if (values[i].value == initial_value) if (values[i].value == initial_value)
@@ -328,7 +329,7 @@ dojo.declare("alfresco.xforms.Select1",
else else
{ {
var combobox = document.createElement("select"); var combobox = document.createElement("select");
combobox.setAttribute("id", this.id); combobox.setAttribute("id", this.id + "-widget");
attach_point.appendChild(combobox); attach_point.appendChild(combobox);
for (var i in values) for (var i in values)
{ {
@@ -344,12 +345,12 @@ dojo.declare("alfresco.xforms.Select1",
}, },
_combobox_changeHandler: function(event) _combobox_changeHandler: function(event)
{ {
this.xform.setXFormsValue(event.target.getAttribute("id"), this.xform.setXFormsValue(this.id,
event.target.options[event.target.selectedIndex].value); event.target.options[event.target.selectedIndex].value);
}, },
_radio_clickHandler: function(event) _radio_clickHandler: function(event)
{ {
this.xform.setXFormsValue(event.target.getAttribute("id"), this.xform.setXFormsValue(this.id,
event.target.value); event.target.value);
} }
}); });
@@ -373,11 +374,14 @@ dojo.declare("alfresco.xforms.CheckBox",
}, },
nodeRef); nodeRef);
dojo.event.connect(this.widget, "onClick", this, this._checkBox_clickHandler); dojo.event.connect(this.widget,
"onMouseUp",
this,
this._checkBox_mouseUpHandler);
}, },
_checkBox_clickHandler: function(event) _checkBox_mouseUpHandler: function(event)
{ {
this.xform.setXFormsValue(this.widget.widgetId, this.xform.setXFormsValue(this.id,
this.widget.checked); this.widget.checked);
} }
}); });
@@ -416,47 +420,51 @@ dojo.declare("alfresco.xforms.Group",
dojo.debug(this.id + ".insertChildAt(" + child.id + ", " + position + ")"); dojo.debug(this.id + ".insertChildAt(" + child.id + ", " + position + ")");
child.parent = this; child.parent = this;
var d = document.createElement("div"); child.domContainer = document.createElement("div");
child.domContainer = d; child.domContainer.setAttribute("style", "position: relative; border: 0px solid green; margin-top: 2px; margin-bottom: 2px;");
d.setAttribute("style", "position: relative; border: 0px solid green; margin-top: 2px; margin-bottom: 2px;"); child.domContainer.style.width = "100%";
d.style.width = "100%";
if (this.parent && this.parent.domNode) if (this.parent && this.parent.domNode)
d.style.top = this.parent.domNode.style.bottom; child.domContainer.style.top = this.parent.domNode.style.bottom;
if (position == this.children.length) if (position == this.children.length)
{ {
this.domNode.appendChild(d); this.domNode.appendChild(child.domContainer);
this.children.push(child); this.children.push(child);
} }
else else
{ {
this.domNode.insertBefore(d, this.getChildAt(position).domContainer); this.domNode.insertBefore(child.domContainer,
this.getChildAt(position).domContainer);
this.children.splice(position, 0, child); this.children.splice(position, 0, child);
} }
if (!(child instanceof alfresco.xforms.Group)) if (!(child instanceof alfresco.xforms.Group))
{ {
var requiredImage = document.createElement("img"); var requiredImage = document.createElement("img");
requiredImage.setAttribute("src", WEBAPP_CONTEXT + "/images/icons/required_field.gif"); requiredImage.setAttribute("src", WEBAPP_CONTEXT + "/images/icons/required_field.gif");
requiredImage.setAttribute("style", "margin: 0px 5px 0px 5px;"); requiredImage.setAttribute("style", "margin: 0px 5px 0px 5px;");
d.appendChild(requiredImage); child.domContainer.appendChild(requiredImage);
if (!child.isRequired()) if (!child.isRequired())
requiredImage.style.visibility = "hidden"; requiredImage.style.visibility = "hidden";
var label = child._getLabelNode(); var label = child._getLabelNode();
if (label) if (label)
d.appendChild(document.createTextNode(dojo.dom.textContent(label))); {
var labelNode = document.createTextNode(dojo.dom.textContent(label));
child.domContainer.appendChild(labelNode);
}
} }
var contentDiv = document.createElement("div"); var contentDiv = document.createElement("div");
contentDiv.setAttribute("id", child.id + "-content"); contentDiv.setAttribute("id", child.id + "-content");
d.appendChild(contentDiv); child.domContainer.appendChild(contentDiv);
contentDiv.style.position = "relative"; contentDiv.style.position = "relative";
// contentDiv.style.width = (d.offsetWidth - contentDiv.offsetLeft) + "px"; // contentDiv.style.width = (d.offsetWidth - contentDiv.offsetLeft) + "px";
child.render(contentDiv); child.render(contentDiv);
if (!(child instanceof alfresco.xforms.Group)) if (!(child instanceof alfresco.xforms.Group))
{ {
contentDiv.style.width = (d.offsetWidth * .7) + "px"; contentDiv.style.width = (child.domContainer.offsetWidth * .7) + "px";
d.style.height = contentDiv.offsetHeight + "px"; child.domContainer.style.height = contentDiv.offsetHeight + "px";
d.style.lineHeight = d.style.height; child.domContainer.style.lineHeight = child.domContainer.style.height;
} }
// contentDiv.appendChild(document.createTextNode("ot " + contentDiv.offsetTop + // contentDiv.appendChild(document.createTextNode("ot " + contentDiv.offsetTop +
@@ -468,9 +476,10 @@ dojo.declare("alfresco.xforms.Group",
: "30%"); : "30%");
d.style.borderColor = "pink"; child.domContainer.style.borderColor = "pink";
d.style.borderWidth = "0px"; child.domContainer.style.borderWidth = "0px";
return d; this._updateDisplay();
return child.domContainer;
}, },
removeChildAt: function(position) removeChildAt: function(position)
{ {
@@ -478,13 +487,16 @@ dojo.declare("alfresco.xforms.Group",
if (!child) if (!child)
throw new Error("unabled to find child at " + position); throw new Error("unabled to find child at " + position);
this.children.splice(position, 1); this.children.splice(position, 1);
dojo.fx.html.fadeOut(child.domContainer, child.domContainer.group = this;
500, var anim = dojo.lfx.html.fadeOut(child.domContainer, 500);
function(node) anim.onEnd = function()
{ {
dojo.dom.removeChildren(node); child.domContainer.style.display = "none";
dojo.dom.removeNode(node); dojo.dom.removeChildren(child.domContainer);
}); dojo.dom.removeNode(child.domContainer);
child.domContainer.group._updateDisplay();
};
anim.play();
}, },
isIndented: function() isIndented: function()
{ {
@@ -502,7 +514,10 @@ dojo.declare("alfresco.xforms.Group",
if (this.isIndented()) if (this.isIndented())
this.domNode.style.marginLeft = "10px"; this.domNode.style.marginLeft = "10px";
return this.domNode; return this.domNode;
} },
_updateDisplay: function()
{
}
}); });
dojo.declare("alfresco.xforms.Repeat", dojo.declare("alfresco.xforms.Repeat",
@@ -512,16 +527,16 @@ dojo.declare("alfresco.xforms.Repeat",
{ {
this.inherited("initializer", [ xform, node ]); this.inherited("initializer", [ xform, node ]);
}, },
selectedIndex: null, _selectedIndex: -1,
insertChildAt: function(child, position) insertChildAt: function(child, position)
{ {
var result = this.inherited("insertChildAt", [ child, position ]); var result = this.inherited("insertChildAt", [ child, position ]);
child.repeat = this; child.repeat = this;
dojo.event.browser.addListener(result, "onclick", function(event) dojo.event.connect(result, "onclick", function(event)
{ {
child.repeat.setFocusedChild(child); child.repeat.setFocusedChild(child);
}); });
var controls = document.createElement("div"); var controls = document.createElement("div");
result.appendChild(controls); result.appendChild(controls);
@@ -551,14 +566,35 @@ dojo.declare("alfresco.xforms.Repeat",
return result; return result;
}, },
removeChildAt: function(position) getSelectedIndex: function()
{ {
this.inherited("removeChildAt", [ position ]); this._selectedIndex = Math.min(this.children.length - 1, this._selectedIndex);
if (this.selectedIndex == position) if (this.children.length == 0)
this.handleIndexChanged(Math.min(this.children.length - 1, position)); this._selectedIndex = -1;
return this._selectedIndex;
},
_updateDisplay: function()
{
for (var i = 0; i < this.children.length; i++)
{
this.children[i].domContainer.style.backgroundColor =
i % 2 ? "#cccc99" : "#ffffff";
if (i == this.getSelectedIndex())
this.children[i].domContainer.style.backgroundColor = "orange";
// dojo.lfx.html.highlight(this.children[i].domContainer,
// "orange",
// 200,
// 0,
// function(node)
// {
// node.style.backgroundColor = "orange";
// }).play();
}
}, },
_insertRepeatItemAfter_handler: function(event) _insertRepeatItemAfter_handler: function(event)
{ {
dojo.event.browser.stopEvent(event);
this.setFocusedChild(event.target.repeatItem);
if (!this.insertRepeatItemAfterTrigger) if (!this.insertRepeatItemAfterTrigger)
this.insertRepeatItemAfterTrigger = this.insertRepeatItemAfterTrigger =
_findElementById(this.node.parentNode, this.id + "-insert_after"); _findElementById(this.node.parentNode, this.id + "-insert_after");
@@ -566,6 +602,8 @@ dojo.declare("alfresco.xforms.Repeat",
}, },
_insertRepeatItemBefore_handler: function(event) _insertRepeatItemBefore_handler: function(event)
{ {
dojo.event.browser.stopEvent(event);
this.setFocusedChild(event.target.repeatItem);
if (!this.insertRepeatItemBeforeTrigger) if (!this.insertRepeatItemBeforeTrigger)
this.insertRepeatItemBeforeTrigger = this.insertRepeatItemBeforeTrigger =
_findElementById(this.node.parentNode, this.id + "-insert_before"); _findElementById(this.node.parentNode, this.id + "-insert_before");
@@ -573,6 +611,8 @@ dojo.declare("alfresco.xforms.Repeat",
}, },
_removeRepeatItem_handler: function(event) _removeRepeatItem_handler: function(event)
{ {
dojo.event.browser.stopEvent(event);
this.setFocusedChild(event.target.repeatItem);
if (!this.removeRepeatItemTrigger) if (!this.removeRepeatItemTrigger)
this.removeRepeatItemTrigger = _findElementById(this.node.parentNode, this.removeRepeatItemTrigger = _findElementById(this.node.parentNode,
this.id + "-delete"); this.id + "-delete");
@@ -580,21 +620,21 @@ dojo.declare("alfresco.xforms.Repeat",
}, },
_moveRepeatItemUp_handler: function(event) _moveRepeatItemUp_handler: function(event)
{ {
dojo.event.browser.stopEvent(event);
var r = event.target.repeat; var r = event.target.repeat;
var index = r.getChildIndex(event.target.repeatItem); var index = r.getChildIndex(event.target.repeatItem);
if (index == 0 || r.children.length == 1) if (index == 0 || r.children.length == 1)
return; return;
event.target.repeat.swapChildren(index, index - 1); event.target.repeat.swapChildren(index, index - 1);
// this.handleIndexChanged(index - 1);
}, },
_moveRepeatItemDown_handler: function(event) _moveRepeatItemDown_handler: function(event)
{ {
dojo.event.browser.stopEvent(event);
var r = event.target.repeat; var r = event.target.repeat;
var index = r.getChildIndex(event.target.repeatItem); var index = r.getChildIndex(event.target.repeatItem);
if (index == r.children.length - 1 || r.children.length == 1) if (index == r.children.length - 1 || r.children.length == 1)
return; return;
event.target.repeat.swapChildren(index, index + 1); event.target.repeat.swapChildren(index, index + 1);
// this.handleIndexChanged(index + 1);
}, },
swapChildren: function(fromIndex, toIndex) swapChildren: function(fromIndex, toIndex)
{ {
@@ -618,10 +658,11 @@ dojo.declare("alfresco.xforms.Repeat",
this.domNode.replaceChild(swapNode, fromChild.domContainer); this.domNode.replaceChild(swapNode, fromChild.domContainer);
this.domNode.replaceChild(fromChild.domContainer, toChild.domContainer); this.domNode.replaceChild(fromChild.domContainer, toChild.domContainer);
this.domNode.replaceChild(toChild.domContainer, swapNode); this.domNode.replaceChild(toChild.domContainer, swapNode);
this.children[fromIndex] = toChild; this.children[fromIndex] = toChild;
this.children[toIndex] = fromChild; this.children[toIndex] = fromChild;
this._selectedIndex = toIndex;
this._updateDisplay();
}, },
setFocusedChild: function(child) setFocusedChild: function(child)
{ {
@@ -635,10 +676,11 @@ dojo.declare("alfresco.xforms.Repeat",
// chiba thinks indexes are initialized to 1 so just // chiba thinks indexes are initialized to 1 so just
// highlight the thing // highlight the thing
if (this.selectedIndex == null && index == 0) if (this.getSelectedIndex() == -1 && index == 0)
this.handleIndexChanged(0); this.handleIndexChanged(0);
// xforms repeat indexes are 1-based else
this.xform.setRepeatIndex(this.id, index + 1); // xforms repeat indexes are 1-based
this.xform.setRepeatIndex(this.id, index + 1);
} }
}, },
isIndented: function() isIndented: function()
@@ -656,12 +698,11 @@ dojo.declare("alfresco.xforms.Repeat",
this.domNode.appendChild(d); this.domNode.appendChild(d);
d.setAttribute("style", "position: relative; height: 20px; line-height: 20px; background-color: #cddbe8; font-weight: bold;"); d.setAttribute("style", "position: relative; height: 20px; line-height: 20px; background-color: #cddbe8; font-weight: bold;");
d.style.width = "100%"; d.style.width = "100%";
dojo.event.browser.addListener(d, dojo.event.connect(d, "onclick", function(event)
"onclick", {
function(event) if (event.target == event.currentTarget)
{ event.currentTarget.repeat.setFocusedChild(null);
event.currentTarget.repeat.setFocusedChild(null); });
});
//used only for positioning the label accurately //used only for positioning the label accurately
var requiredImage = document.createElement("img"); var requiredImage = document.createElement("img");
@@ -692,28 +733,8 @@ dojo.declare("alfresco.xforms.Repeat",
handleIndexChanged: function(index) handleIndexChanged: function(index)
{ {
dojo.debug(this.id + ".handleIndexChanged(" + index + ")"); dojo.debug(this.id + ".handleIndexChanged(" + index + ")");
if (this.selectedIndex != null && this._selectedIndex = index;
this.selectedIndex >= 0 && this._updateDisplay();
this.selectedIndex < this.children.length)
dojo.lfx.html.unhighlight(this.getChildAt(this.selectedIndex).domContainer,
"white",
200,
0,
function(node)
{
node.style.backgroundColor = "white";
}).play();
if (index >= 0 && index < this.children.length)
dojo.lfx.html.highlight(this.getChildAt(index).domContainer,
"orange",
200,
0,
function(node)
{
node.style.backgroundColor = "orange";
}).play();
this.selectedIndex = index;
}, },
handlePrototypeCloned: function(prototypeId) handlePrototypeCloned: function(prototypeId)
{ {
@@ -999,7 +1020,7 @@ dojo.declare("alfresco.xforms.XForm",
} }
break; break;
case "xforms-submit-error": case "xforms-submit-error":
alert("Please provide values for all required fields."); _show_error("Please provide values for all required fields.");
break; break;
default: default:
{ {
@@ -1087,12 +1108,9 @@ function addSubmitHandlerToButton(b)
var baseOnClick = b.onclick; var baseOnClick = b.onclick;
b.onclick = function(event) b.onclick = function(event)
{ {
// alert("submitting xform from " + b.getAttribute("id") +
// " b " + b +
// " this " + this );
if (!document.submitWidget.done) if (!document.submitWidget.done)
{ {
// alert("not done, resubmitting"); dojo.debug("not done, resubmitting");
tinyMCE.triggerSave(); tinyMCE.triggerSave();
document.submitWidget.currentButton = this; document.submitWidget.currentButton = this;
document.submitWidget.widget.buttonClick(); document.submitWidget.widget.buttonClick();
@@ -1100,7 +1118,7 @@ function addSubmitHandlerToButton(b)
} }
else else
{ {
// alert("done - doing base click"); dojo.debug("done - doing base click");
return baseOnClick(event); return baseOnClick(event);
} }
} }
@@ -1134,17 +1152,47 @@ function create_ajax_request(xform, serverMethod, methodArgs, load, error)
result.load = load; result.load = load;
dojo.event.connect(result, "load", function(type, data, evt) dojo.event.connect(result, "load", function(type, data, evt)
{ {
// _hide_errors();
ajax_request_load_handler(this); ajax_request_load_handler(this);
}); });
result.mimetype = "text/xml"; result.mimetype = "text/xml";
result.error = error || function(type, e) result.error = error || function(type, e)
{ {
alert("error [" + type + "] " + e.message); dojo.debug("error [" + type + "] " + e.message);
_show_error(e.message);
ajax_request_load_handler(this); ajax_request_load_handler(this);
}; };
return result; return result;
} }
function _hide_errors()
{
var errorDiv = document.getElementById("alf-xforms-error");
if (errorDiv)
errorDiv.style.display = "none";
}
function _show_error(msg)
{
var errorDiv = document.getElementById("alf-xforms-error");
if (!errorDiv)
{
errorDiv = document.createElement("div");
errorDiv.setAttribute("id", "alf-xforms-error");
errorDiv.setAttribute("class", "infoText statusErrorText");
errorDiv.setAttribute("style", "padding: 2px; border: 1px solid #003366");
var alfUI = document.getElementById("alf-ui");
dojo.dom.prependChild(errorDiv, alfUI);
}
if (errorDiv.style.display == "block")
errorDiv.innerHTML = errorDiv.innerHTML + "<br/>" + e.message;
else
{
errorDiv.innerHTML = msg;
errorDiv.style.display = "block";
}
}
function send_ajax_request(req) function send_ajax_request(req)
{ {
ajax_request_send_handler(req); ajax_request_send_handler(req);