updated to work for tabular and stacked inlines

winfieldco · May 11, 2016 · d5994d7 · d5994d7
1 parent 130185a
commit d5994d7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/metadata.py b/metadata.py
@@ -1,4 +1,4 @@
 name = 'tinymce'
 authors = 'Joost Cassee, Aljosa Mohorovic'
-version = '1.5.3-post2'
+version = '1.5.3-post3'
 release = version
diff --git a/tinymce/static/django_tinymce/init_tinymce.js b/tinymce/static/django_tinymce/init_tinymce.js
@@ -25,14 +25,25 @@
     // XXX: We don't use jQuery's click event as it won't work in Django 1.4
     document.body.addEventListener("click", function(ev) {
 
-      // We always use stacked inlines so use this method instead
+      // Check for tabular inlines
       var $addRow = $(ev.target).closest('tr').prev();
+      if($addRow.length == 0) {
+
+        // Stacked inlines
+        $addRow = $(ev.target.parentNode);
+
+      }
+
+      if($addRow.length > 0) {
+
+        setTimeout(function() {  // We have to wait until the inline is added
+          $('textarea.tinymce', $addRow.parent()).each(function () {
+            initTinyMCE($(this));
+          });
+        }, 0);
+
+      }
 
-      setTimeout(function() {  // We have to wait until the inline is added
-        $('textarea.tinymce', $addRow.parent()).each(function () {
-          initTinyMCE($(this));
-        });
-      }, 0);
     }, true);
   });
 }(django.jQuery));