Skip to content

Commit 066fa38

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Fix/bootstrap turbo docs Symfony CLI: add wildcard local domain information Symfony CLI: fix config directory path
2 parents 816abbc + a9a2cdc commit 066fa38

File tree

3 files changed

+29
-2
lines changed

3 files changed

+29
-2
lines changed

frontend/encore/bootstrap.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,25 @@ Now, require bootstrap from any of your JavaScript files:
7373
$('[data-toggle="popover"]').popover();
7474
});
7575
76+
Using Bootstrap with Turbo
77+
---------------------------
78+
79+
If you are using bootstrap with Turbo Drive, to allow your JavaScript to load on each page change,
80+
wrap the initialization in a ``turbo:load`` event listener:
81+
82+
.. code-block:: javascript
83+
84+
// app.js
85+
86+
// this waits for Turbo Drive to load
87+
document.addEventListener('turbo:load', function (e) {
88+
// this enables bootstrap tooltips globally
89+
let tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
90+
let tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
91+
return new Tooltip(tooltipTriggerEl)
92+
});
93+
});
94+
7695
Using other Bootstrap / jQuery Plugins
7796
--------------------------------------
7897

frontend/encore/dev-server.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ server SSL certificate:
7979
+ options.server = {
8080
+ type: 'https',
8181
+ options: {
82-
+ pfx: path.join(process.env.HOME, '.symfony/certs/default.p12'),
82+
+ pfx: path.join(process.env.HOME, '.symfony5/certs/default.p12'),
8383
+ }
8484
+ }
8585
+ })

setup/symfony_server.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,14 @@ new custom domain.
232232
Browse the http://127.0.0.1:7080 URL to get the full list of local project
233233
directories, their custom domains, and port numbers.
234234

235+
You can also add a wildcard domain:
236+
237+
.. code-block:: terminal
238+
239+
$ symfony proxy:domain:attach "*.my-domain"
240+
241+
So it will match all subdomains like ``https://admin.my-domain.wip``, ``https://other.my-domain.wip``...
242+
235243
When running console commands, add the ``https_proxy`` env var to make custom
236244
domains work:
237245

@@ -254,7 +262,7 @@ domains work:
254262

255263
.. tip::
256264

257-
If you prefer to use a different TLD, edit the ``~/.symfony/proxy.json``
265+
If you prefer to use a different TLD, edit the ``~/.symfony5/proxy.json``
258266
file (where ``~`` means the path to your user directory) and change the
259267
value of the ``tld`` option from ``wip`` to any other TLD.
260268

0 commit comments

Comments
 (0)