Skip to content

Commit 89e4f80

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: The method renderForm generate a 422 Unprocessable Entity if the form is invalid. So we can’t pass in the success method. I suggest to replace it with the complete method. Updating sass-loader version Removing MooTools (!)
2 parents 66a7446 + 99e39ae commit 89e4f80

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

components/css_selector.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ long and unwieldy expressions.
4040
Many developers -- particularly web developers -- are more comfortable
4141
using CSS selectors to find elements. As well as working in stylesheets,
4242
CSS selectors are used in JavaScript with the ``querySelectorAll()`` function
43-
and in popular JavaScript libraries such as jQuery, Prototype and MooTools.
43+
and in popular JavaScript libraries such as jQuery.
4444

4545
CSS selectors are less powerful than XPath, but far easier to write, read
4646
and understand. Since they are less powerful, almost all CSS selectors can

form/dynamic_form_modification.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,11 +568,11 @@ field according to the current selection in the ``sport`` field:
568568
url : $form.attr('action'),
569569
type: $form.attr('method'),
570570
data : data,
571-
success: function(html) {
571+
complete: function(html) {
572572
// Replace current position field ...
573573
$('#meetup_position').replaceWith(
574574
// ... with the returned one from the AJAX response.
575-
$(html).find('#meetup_position')
575+
$(html.responseText).find('#meetup_position')
576576
);
577577
// Position field now displays the appropriate positions.
578578
}

frontend/encore/simple-example.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,19 +299,19 @@ Encore. When you do, you'll see an error!
299299
.. code-block:: terminal
300300
301301
> Error: Install sass-loader & sass to use enableSassLoader()
302-
> yarn add sass-loader@^10.0.0 sass --dev
302+
> yarn add sass-loader@^12.0.0 sass --dev
303303
304304
Encore supports many features. But, instead of forcing all of them on you, when
305305
you need a feature, Encore will tell you what you need to install. Run:
306306

307307
.. code-block:: terminal
308308
309309
# if you use the Yarn package manager
310-
$ yarn add sass-loader@^10.0.0 sass --dev
310+
$ yarn add sass-loader@^12.0.0 sass --dev
311311
$ yarn encore dev --watch
312312
313313
# if you use the npm package manager
314-
$ npm install sass-loader@^10.0.0 sass --save-dev
314+
$ npm install sass-loader@^12.0.0 sass --save-dev
315315
$ npm run watch
316316
317317
Your app now supports Sass. Encore also supports LESS and Stylus. See

0 commit comments

Comments
 (0)