Fix init version form bug

qor · May 16, 2018 · ae62055 · ae62055
1 parent 0f1275f
commit ae62055
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/views/themes/publish2/assets/javascripts/publish2.js b/views/themes/publish2/assets/javascripts/publish2.js
diff --git a/views/themes/publish2/assets/javascripts/publish2/publish2.js b/views/themes/publish2/assets/javascripts/publish2/publish2.js
@@ -249,13 +249,16 @@
             $types = $action.find('[data-action-type]'),
             $slideoutForm = $('.qor-slideout__body form'),
             $bottomsheetForm = $('.qor-bottomsheets__body form'),
+            isInBottomsheets = $action.closest('.qor-bottomsheets').length,
+            isInSlideout = $action.closest('.qor-slideout').length,
+            $parent,
             element = QorPublish2.ELEMENT;
 
         // move publsh2 actions into slideout form tag
         if ($action.length) {
-            if ($bottomsheetForm.length) {
+            if ($bottomsheetForm.length && isInBottomsheets) {
                 $action.prependTo($bottomsheetForm.first());
-            } else if ($slideoutForm.length) {
+            } else if ($slideoutForm.length && isInSlideout) {
                 $action.prependTo($slideoutForm.first());
             }
         }
@@ -264,9 +267,16 @@
             return;
         }
 
+        if (isInSlideout) {
+            $parent = $('.qor-slideout');
+        } else if (isInBottomsheets) {
+            $parent = $('.qor-bottomsheets');
+        }
+
         $types.each(function() {
             var $this = $(this);
-            $(element[$this.data('actionType')])
+            $parent
+                .find(element[$this.data('actionType')])
                 .closest('.qor-form-section')
                 .hide();
         });

diff --git a/views/themes/publish2/assets/javascripts/publish2_inline_edit.js b/views/themes/publish2/assets/javascripts/publish2_inline_edit.js