From c1fb1c5bc37ddafe189e1bcd29b83d6b84bef372 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 21 Mar 2019 22:57:18 +0300 Subject: [PATCH] Support Drupal core 8.6 and migrate to Media in core --- ...ntity_view_display.node.alert.ds_alert.yml | 2 - ...splay.media.image.playlist_item_teaser.yml | 2 +- ...y_view_mode.media.playlist_item_teaser.yml | 2 +- .../openy_digital_signage_playlist.info.yml | 2 +- .../js/screen-schedule-handler.js | 6 +- .../package-lock.json | 17104 ++++++++++++++++ .../scss/screen-schedule/_base.scss | 6 +- .../src/Entity/OpenYScreen.php | 2 +- ...ck_free_html.field_ds_background_image.yml | 37 - ..._promotional.field_ds_background_image.yml | 37 - ...lock_content.field_ds_background_image.yml | 29 - ...play.media.image.digital_signage_media.yml | 2 +- ..._form_mode.media.digital_signage_media.yml | 2 +- ...browser.digital_signage_images_library.yml | 6 +- ...ws.view.digital_signage_images_library.yml | 4 +- .../views.view.digital_signage_media.yml | 2 +- .../openy_ds_media_library.info.yml | 2 +- .../Field/FieldWidget/DateRangeWidgetBase.php | 26 - .../Field/FieldWidget/TimeRangeWidgetBase.php | 26 - 19 files changed, 17125 insertions(+), 174 deletions(-) create mode 100644 modules/openy_digital_signage_screen/package-lock.json delete mode 100644 modules/openy_digital_signage_screen_content/modules/openy_digital_signage_blocks/config/install/field.field.block_content.digital_signage_block_free_html.field_ds_background_image.yml delete mode 100644 modules/openy_digital_signage_screen_content/modules/openy_digital_signage_blocks/config/install/field.field.block_content.digital_signage_promotional.field_ds_background_image.yml delete mode 100644 modules/openy_digital_signage_screen_content/modules/openy_digital_signage_blocks/config/install/field.storage.block_content.field_ds_background_image.yml diff --git a/modules/openy_digital_signage_alerts/config/install/core.entity_view_display.node.alert.ds_alert.yml b/modules/openy_digital_signage_alerts/config/install/core.entity_view_display.node.alert.ds_alert.yml index d4cbc80..ea6d4a3 100644 --- a/modules/openy_digital_signage_alerts/config/install/core.entity_view_display.node.alert.ds_alert.yml +++ b/modules/openy_digital_signage_alerts/config/install/core.entity_view_display.node.alert.ds_alert.yml @@ -3,7 +3,6 @@ status: true dependencies: config: - core.entity_view_mode.node.ds_alert - - field.field.node.alert.field_alert_belongs - field.field.node.alert.field_alert_color - field.field.node.alert.field_alert_description - field.field.node.alert.field_alert_display_on_ds @@ -44,7 +43,6 @@ content: hidden: addthis: true content_moderation_control: true - field_alert_belongs: true field_alert_color: true field_alert_display_on_ds: true field_alert_ds_screen: true diff --git a/modules/openy_digital_signage_playlist/config/install/core.entity_view_display.media.image.playlist_item_teaser.yml b/modules/openy_digital_signage_playlist/config/install/core.entity_view_display.media.image.playlist_item_teaser.yml index 854e5fa..70c2aa4 100644 --- a/modules/openy_digital_signage_playlist/config/install/core.entity_view_display.media.image.playlist_item_teaser.yml +++ b/modules/openy_digital_signage_playlist/config/install/core.entity_view_display.media.image.playlist_item_teaser.yml @@ -8,7 +8,7 @@ dependencies: - field.field.media.image.field_media_in_library - field.field.media.image.field_media_tags - image.style.playlist_item_thumbnail - - media_entity.bundle.image + - media.type.image module: - image id: media.image.playlist_item_teaser diff --git a/modules/openy_digital_signage_playlist/config/install/core.entity_view_mode.media.playlist_item_teaser.yml b/modules/openy_digital_signage_playlist/config/install/core.entity_view_mode.media.playlist_item_teaser.yml index 6afa6f1..e363a56 100644 --- a/modules/openy_digital_signage_playlist/config/install/core.entity_view_mode.media.playlist_item_teaser.yml +++ b/modules/openy_digital_signage_playlist/config/install/core.entity_view_mode.media.playlist_item_teaser.yml @@ -2,7 +2,7 @@ langcode: en status: true dependencies: module: - - media_entity + - drupal:media (>= 8.4) id: media.playlist_item_teaser label: 'Playlist item teaser' targetEntityType: media diff --git a/modules/openy_digital_signage_playlist/openy_digital_signage_playlist.info.yml b/modules/openy_digital_signage_playlist/openy_digital_signage_playlist.info.yml index 12fb39b..89d8ada 100644 --- a/modules/openy_digital_signage_playlist/openy_digital_signage_playlist.info.yml +++ b/modules/openy_digital_signage_playlist/openy_digital_signage_playlist.info.yml @@ -7,7 +7,7 @@ dependencies: - openy_digital_signage_schedule - datetime - duration_field - - media_entity + - drupal:media (>= 8.4) - openy_media_image - entity_browser - openy_digital_signage_schedule diff --git a/modules/openy_digital_signage_screen/js/screen-schedule-handler.js b/modules/openy_digital_signage_screen/js/screen-schedule-handler.js index 57ed77a..ec7895a 100644 --- a/modules/openy_digital_signage_screen/js/screen-schedule-handler.js +++ b/modules/openy_digital_signage_screen/js/screen-schedule-handler.js @@ -70,12 +70,12 @@ * @prop {Drupal~behaviorAttach} attach * Adds proper orientation classes to all the output layouts. */ - Drupal.behaviors.screen_schedule_frame = { + Drupal.behaviors.screenScheduleFrame = { attach: function (context, settings) { - $('.frame-container', context).once().each(function () { + $('.frame-container').once().each(function () { var $self = $(this); var src = $self.data('src'); - $(this).append($('