From a648f1863bea84e3c326c1a9b83bacb85a9cd20b Mon Sep 17 00:00:00 2001
From: ynamite <ynamite@bluewin.ch>
Date: Wed, 1 Feb 2017 15:59:29 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20f=C3=BCr=20TinyMCE=20&=20Label-Fokus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

IDs von kopierten Elementen, die nicht speziell sind (wie zBsp. bei
REX_MEDIA, Redactor etc.), werden erweitert. So setzen die Labels denn
Focus auf das jeweilige Eingabe-Element.

Dadurch wird auch das Problem mit dem kopieren von TinyMCE Instanzen
behoben.
---
 assets/mblock.js | 53 +++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/assets/mblock.js b/assets/mblock.js
index 8c1517f..a908a7c 100644
--- a/assets/mblock.js
+++ b/assets/mblock.js
@@ -148,10 +148,6 @@ function mblock_reindex(element) {
                 $(this).attr('name', value);
             }
 
-            // if ($(this).attr('id')) {
-            //     mblock_replace_for(element, $(this), index);
-            // }
-
             // select rex button
             if ($(this).prop("nodeName") == 'SELECT' && $(this).attr('id') && (
                     $(this).attr('id').indexOf("REX_MEDIALIST_SELECT_") >= 0 ||
@@ -305,35 +301,32 @@ function mblock_reindex(element) {
         }
 
     }
+    // sets for attribute for most elements to make them work accordingly
+    mblock_replace_for(element);
+
     mblock_module.executeRegisteredCallbacks('reindex_end');
 }
 
-function mblock_replace_for(element, item, index) {
-    if (item.attr('id') && (item.attr('id').indexOf("REX_MEDIA") >= 0 ||
-        item.attr('id').indexOf("REX_LINK") >= 0 ||
-        item.attr('id').indexOf("redactor") >= 0 ||
-        item.attr('id').indexOf("markitup") >= 0
-    )) { } else {
-        if (item.attr('id')) {
-            item.attr('id', item.attr('id').replace(/_\d_+/, '_' + index + '_'));
-
-            var label;
-
-            if (item.find('label').length) {
-                label = item.find('label');
-            }
-            if (item.parent().find('label').length) {
-                label = item.parent().find('label');
-            }
-            if (item.parent().parent().find('label').length) {
-                label = item.parent().parent().find('label');
-            }
-            if (label.length) {
-                label.attr('for', label.attr('for').replace(/_\d_+/, '_' + index + '_'));
-            }
-        }
-    }
-    mblock_replace_checkbox_for(element);
+function mblock_replace_for(element) {
+	
+	element.find(' > div').each(function(index) {
+		var mblock = $(this);
+		mblock.find('input,textarea,select').each(function(key) {
+			var el = $(this);
+			var id = el.attr('id');
+			if (typeof id !== typeof undefined && id !== false) {
+				if (!(id.indexOf("REX_MEDIA") >= 0 ||
+				    id.indexOf("REX_LINK") >= 0 ||
+				    id.indexOf("redactor") >= 0 ||
+				    id.indexOf("markitup") >= 0)
+				) {
+					var label = mblock.find('label[for="'+id+'"]');
+					el.attr('id', el.attr('name'));
+					label.attr('for', el.attr('name'));
+				}
+			}
+		});
+	});
 }
 
 function mblock_replace_checkbox_for(element) {