pg_rails 7.3.3 → 7.3.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/pg_associable/app/javascript/modal_controller.js +4 -2
- data/pg_engine/app/components/asociable_modal_component.html.slim +1 -0
- data/pg_engine/app/components/modal_component.html.slim +3 -2
- data/pg_engine/app/components/modal_component.rb +6 -1
- data/pg_layout/app/javascript/application.js +1 -1
- data/pg_rails/lib/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 78a7c2d3d7277352e4c78b167e2d106a0d6fe1be83a1f5f27d3eacd00c0fb6f7
|
4
|
+
data.tar.gz: a066552a098bf72375cb3957a53b3f4db473d640ceeeaee833942e181ff057d5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: edd3474ce84d32bddd24aa4b010c77c909534874eb8e8101468c7e5ebdf83b9b3db43c245049fae39ca716b79cc582315c81c14b5cdde6117d474b5c2aafeec3
|
7
|
+
data.tar.gz: cf514c46e8737deaac130cef0049b9e2fec7852948e946cff30b94a97134dbb8dd938b1be95a2e86a140152ad20c396508776a0e86c3bac8f21db5272435b0d1
|
@@ -9,12 +9,14 @@ export default class extends Controller {
|
|
9
9
|
|
10
10
|
connect (e) {
|
11
11
|
this.modalPuntero = new bootstrap.Modal(this.element)
|
12
|
-
if (this.element.dataset.removeOnHide) {
|
12
|
+
if (this.element.dataset.removeOnHide === 'true') {
|
13
13
|
this.element.addEventListener('hidden.bs.modal', (e) => {
|
14
14
|
this.element.remove()
|
15
15
|
})
|
16
16
|
}
|
17
|
-
this.
|
17
|
+
if (this.element.dataset.autoShow === 'true') {
|
18
|
+
this.modalPuntero.show()
|
19
|
+
}
|
18
20
|
|
19
21
|
this.element.addEventListener('turbo:frame-render', (ev) => {
|
20
22
|
if (ev.detail.fetchResponse.response.ok && ev.target.id === 'modal_content') {
|
@@ -1,5 +1,6 @@
|
|
1
|
-
.modal[class="#{@klass}" tabindex="-1" data-controller="modal"
|
2
|
-
data-remove-on-hide="
|
1
|
+
.modal[id="#{@id}" class="#{@klass}" tabindex="-1" data-controller="modal"
|
2
|
+
data-remove-on-hide="#{@remove_on_hide}" data-turbo-temporary="true"
|
3
|
+
data-auto-show="#{@auto_show}"]
|
3
4
|
.modal-dialog
|
4
5
|
.modal-content
|
5
6
|
= content
|
@@ -1,11 +1,16 @@
|
|
1
1
|
class ModalComponent < ViewComponent::Base
|
2
|
-
def initialize(klass: 'modal-xl')
|
2
|
+
def initialize(klass: 'modal-xl', id: nil, auto_show: true)
|
3
3
|
@klass = klass
|
4
|
+
@auto_show = auto_show
|
5
|
+
@id = id
|
6
|
+
@remove_on_hide = @auto_show
|
4
7
|
|
5
8
|
super
|
6
9
|
end
|
7
10
|
|
8
11
|
def before_render
|
12
|
+
return unless @auto_show
|
13
|
+
|
9
14
|
controller.instance_variable_set(:@using_modal, true)
|
10
15
|
end
|
11
16
|
end
|
@@ -31,7 +31,7 @@ document.addEventListener('turbo:before-fetch-request', (ev) => {
|
|
31
31
|
// on successful redirect no haya posibilidad de que se abra un modal
|
32
32
|
// FIXME: buscar una manera mejor de hacerlo porque es para problemas
|
33
33
|
// quizás, con la movida de abrir modales desde JS
|
34
|
-
if (ev.detail.fetchOptions.method === 'post') {
|
34
|
+
if (ev.detail.fetchOptions.method.toLowerCase() === 'post') {
|
35
35
|
ev.detail.fetchOptions.headers.Accept = 'text/html, application/xhtml+xml'
|
36
36
|
}
|
37
37
|
|
data/pg_rails/lib/version.rb
CHANGED