From 3da6e266f883985b8a0bd417debf11ff52f51507 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Wed, 27 Jan 2010 12:13:56 +0000
Subject: [PATCH] Merged V3.2 to HEAD    17891: Merged DEV_TEMPORARY to V3.2   
                17873: ETHREEOH-3810: WCM - Recursion detector erroring   
 18032: Merged V3.1 to V3.2                  18030: Merged V2.2 to V3.1       
              17683: Merged DEV_TEMPORARY to V2.2 (back-port of fix)          
              17677: ETHREEOH-2778: davfs2 is not working correctly with
 Alfresco                     17880: Merged DEV_TEMPORARY to V2.2 (record-only
 as fix is already applied to 3.1 branch)                        17845:
 ETWOTWO-1289: My Web Files (Forms) dashlets: XSS Attck can be made when web
 project's details has been edited    18062: Merged DEV_TEMPORARY to V3.2     
             18036: ETHREEOH-1844: Text field (areas) became non-editable if
 user use navigate-remove combination for repeatable elements on Create Web
 content based on web form screen    18205: Merged V3.1 to V3.2 (record-only) 
                  *RECORD ONLY* Merged DEV/TEMPORARY to 3.1                  
 17837: ETHREEOH-3801: Creating users via the api does not add them to the
 user store    18277: Merged DEV_TEMPORARY to V3.2                   18178:
 ETHREEOH-3222: ERROR [org.alfresco.webdav.protocol] WebDAV method not
 implemented - PROPPATCH    18311: Fix for ETHREEOH-3872: forms32 examples not
 working    18317: Remaining fixes to forms samples (ETHREEOH-3872)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/web/forms/xforms/Schema2XForms.java   | 6 ++++--
 source/web/scripts/ajax/xforms.js                           | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
index 5f2c632527..01380cee61 100644
--- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
+++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
@@ -1861,10 +1861,12 @@ public class Schema2XForms implements Serializable
                       path,
                       occurs,
                       resourceBundle);
-      
+					  
+      Object poppedElement = this.parentStack.pop();
+	  
       if (LOGGER.isDebugEnabled())
       {
-         LOGGER.debug("[addElementToGroup] popped element " + this.parentStack.pop() + " from parent stack");
+         LOGGER.debug("[addElementToGroup] popped element " + poppedElement + " from parent stack");
          LOGGER.debug("[addElementToGroup] adding " + (occurs.maximum == 1
                                 ? 1
                                 : occurs.minimum + 1) +
diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js
index ba9a89c9ac..c86182aa87 100644
--- a/source/web/scripts/ajax/xforms.js
+++ b/source/web/scripts/ajax/xforms.js
@@ -3732,6 +3732,9 @@ alfresco.xforms.Repeat = alfresco.xforms.VGroup.extend({
     event.stopPropagation();
     if (this.isRemoveRepeatItemEnabled())
     {
+      // set tinymce current instance to null
+      alfresco.xforms.RichTextEditor.currentInstance = null;
+
       var index = this._repeatControls.indexOf(event.target.parentNode);
       var repeatItem = this.getChildAt(index);
       this.setFocusedChild(repeatItem);