Skip to content

Commit

Permalink
Update OOUI to 0.49 (#752)
Browse files Browse the repository at this point in the history
Change to a hacky but functional way of loading jQuery, to get around
the changes with jQuery 3.4.1.

Bug: T233182
  • Loading branch information
samwilson authored Apr 1, 2024
1 parent edf4349 commit 6d70e4f
Show file tree
Hide file tree
Showing 9 changed files with 5,655 additions and 20,044 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.20
18.19
1 change: 0 additions & 1 deletion assets/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// we're manually adding this here. It's the only indicator we use (there are three others).
// More info: T217393
.oo-ui-indicator-down {
background-image: url('../node_modules/oojs-ui/dist/themes/wikimediaui/images/indicators/down.png');
background-image: linear-gradient(transparent, transparent), url('../node_modules/oojs-ui/dist/themes/wikimediaui/images/indicators/down.svg');
}

Expand Down
4 changes: 4 additions & 0 deletions assets/jqueryinit.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// eslint-disable-next-line
var $ = require( 'jquery' );
window.$ = $;
window.jQuery = $;
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ext-libxml": "*",
"ext-mbstring": "*",
"guzzlehttp/guzzle": "^7.4",
"oojs/oojs-ui": "0.33.4",
"oojs/oojs-ui": "0.49.0",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpdoc-parser": "^1.6",
"sensio/framework-extra-bundle": "^6.2",
Expand Down
43 changes: 26 additions & 17 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- .:/var/www:cached

assets:
image: node:14.15
image: node:18.19
working_dir: /svgtranslate
volumes:
- ./:/svgtranslate:cached
Expand Down
Loading

0 comments on commit 6d70e4f

Please sign in to comment.