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

Merged V3.2 to HEAD

Browse Source 
17201: Fix for ETHREEOH-1786: Time fields are displayed incorrectly
   17202: Fix for ETHREEOH-1886: alf:hint tag in XSDs results in error
   17204: Fix for ETHREEOH-1941: gMonth element is not correctly handled on creating web content based on web form process
   17206: Fixed ETHREEOH-1134 "Incorrect behavior of tab indexes for windows"
   17212: Fixed ETHREEOH-3063 "It is impossible to add tags after creating duplicate wiki page"
   17214: Fix for ETHREEOH-1940: Problem with creating web forms containing mandatory boolean attributes with default values
   17226: Fixed ETHREEOH-3105 "Error occurs when user add tag containing disallowed symbols."
   17228: ETHREEOH-3181 - Tag inconsistence between JSF and Share client
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.2:r17201-17204,17206-17207,17211-17216,17219-17228


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-14 13:06:47 +00:00
parent ae4836d0dd
commit f56da7800c
7 changed files with 128 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -412,7 +412,7 @@ alfresco.xforms.Widget = new Class({
/** Returns the widget's label. */
getLabel: function()
{
var result = "";
var result = "";
var node = this._getChildXFormsNode("label");
if (node && node.firstChild !== null)
@@ -430,15 +430,29 @@ alfresco.xforms.Widget = new Class({
/** Returns the widget's alert text. */
getAlert: function()
{
var result = "";
var node = this._getChildXFormsNode("alert");
return node ? node.firstChild.nodeValue : "";
if (node && node.firstChild !== null)
{
result = node.firstChild.nodeValue;
}
return result;
},
/** Returns the widget's alert text. */
getHint: function()
{
var result = null;
var node = this._getChildXFormsNode("hint");
return node ? node.firstChild.nodeValue : null;
if (node && node.firstChild !== null)
{
result = node.firstChild.nodeValue;
}
return result;
},
/** Makes the label red. */
@@ -2310,6 +2324,7 @@ alfresco.xforms.MonthPicker = alfresco.xforms.ComboboxSelect1.extend({
initialize: function(xform, xformsNode)
{
this.parent(xform, xformsNode);
dojo.require("dojo.date.format");
},
/////////////////////////////////////////////////////////////////