Skip to content

Commit 2674019

Browse files
authored
Merge pull request #67 from ASUWebPlatforms/release-2.15.2
Release 2.15.2
2 parents 7a7690d + 2da0801 commit 2674019

File tree

7 files changed

+10782
-2842
lines changed

7 files changed

+10782
-2842
lines changed

upstream-configuration/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"drupal/components": "3.0.0-beta3",
1515
"drupal/config_readonly": "1.0.0-beta5",
1616
"drupal/config_update": "2.0.0-alpha3",
17-
"drupal/core-composer-scaffold": "10.3.11",
18-
"drupal/core-recommended": "10.3.11",
17+
"drupal/core-composer-scaffold": "10.3.13",
18+
"drupal/core-recommended": "10.3.13",
1919
"drupal/crop": "2.3.0",
2020
"drupal/ctools": "4.1.0",
2121
"drupal/current_page_crumb": "1.5.0",
@@ -27,7 +27,7 @@
2727
"drupal/field_group": "3.4.0",
2828
"drupal/field_menu": "2.1.0",
2929
"drupal/field_states_ui": "3.0",
30-
"drupal/fontawesome": "2.x-dev#65e140f",
30+
"drupal/fontawesome": "2.26",
3131
"drupal/image_widget_crop": "2.4.0",
3232
"drupal/imagemagick": "3.6.0",
3333
"drupal/layout_builder_component_attributes": "2.1.1",
@@ -68,5 +68,5 @@
6868
"config": {
6969
"sort-packages": true
7070
},
71-
"version": "2.15.1"
71+
"version": "2.15.2"
7272
}

web/modules/webspark/webspark_ckeditor_plugins/js/build/websparkPlugin.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/modules/webspark/webspark_ckeditor_plugins/js/ckeditor5_plugins/websparkPlugin/src/table/websparktableview.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { icons } from "ckeditor5/src/core";
22
import {
33
FocusCycler,
44
Model,
5+
ViewModel,
56
View,
67
ViewCollection,
78
submitHandler,
@@ -276,7 +277,7 @@ function prepareListOptions(options) {
276277
for (const option of options) {
277278
const def = {
278279
type: "button",
279-
model: new Model({
280+
model: new ViewModel({
280281
commandName: "websparkTable",
281282
commandParam: option.model,
282283
label: option.title,

0 commit comments

Comments
 (0)