issue #825: Множество открытых окошек жалоб (#826)

DrupalRU · Nov 29, 2017 · 346266e · 346266e
1 parent eb00dda
commit 346266e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/profiles/drupalru/themes/druru/js/druru.js b/profiles/drupalru/themes/druru/js/druru.js
@@ -242,6 +242,23 @@ var Drupal = Drupal || {};
           }
         });
       }
+
+      // Open or close ticket-popover on click
+      $('[data-toggle="ticket-popover"]').on('click', function() {
+        $(this).popover('toggle');
+        $('.btn-ticket-popover-close').remove();
+        $('.popover-title').append('<button type="button" class="close btn-ticket-popover-close">&times;</button>');
+      });
+      // Close ticket-popover on click outside OR on click close button
+      $(document).on('click', function(e) {
+        var $target = $(e.target);
+        if ($target.data('toggle') !== 'popover'
+          && $target.closest('[data-toggle="ticket-popover"]').length === 0
+          && $target.closest('.popover.in').length === 0
+          || $target.is('.btn-ticket-popover-close') ) {
+          $('[data-toggle="ticket-popover"]').popover('hide');
+        }
+      });
     }
   };
 

diff --git a/profiles/drupalru/themes/druru/theme/common.inc b/profiles/drupalru/themes/druru/theme/common.inc
@@ -458,7 +458,7 @@ function _druru_wrap_claim(&$content, $type,  $id) {
         'tabindex' => 0,
         'role' => 'button',
         'data-toggle' => 'ticket-popover',
-        'data-trigger' => 'click',
+        'data-trigger' => 'manual',
         'title' => $category,
         'data-ticket-type' => $type,
         'data-ticket' => $id,