Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@

<% ssr_html = local_assigns[:skip_ssr] ? '' : render_scrolled_entry(entry, local_assigns[:seed_options] || {}) %>

<% if !local_assigns[:skip_ssr] && (params[:frontend] == 'v2' || entry.feature_state('frontend_v2')) %>
<%= generated_media_queries_tags_for(ssr_html) %>
<% end %>
</head>
<body>
<%= structured_data_for_entry(entry) unless local_assigns[:skip_structured_data] %>
Expand Down
2 changes: 0 additions & 2 deletions entry_types/scrolled/config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ de:
values:
large: Groß
small: Klein
frontend_v2:
feature_name: Frontend v2
hls_instead_of_dash:
feature_name: HLS statt DASH für Videos verwenden
iconInlineFileRights:
Expand Down
2 changes: 0 additions & 2 deletions entry_types/scrolled/config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ en:
values:
large: Large
small: Small
frontend_v2:
feature_name: Frontend v2
hls_instead_of_dash:
feature_name: Use HLS instead of DASH for videos
iconInlineFileRights:
Expand Down
14 changes: 0 additions & 14 deletions entry_types/scrolled/lib/pageflow_scrolled/plugin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ def configure(config)
c.features.register('iframe_embed_content_element')
c.features.register('social_embed_content_element')
c.features.register('legacy_social_embed_content_elements')
c.features.register('frontend_v2')
c.features.register('scrolled_entry_fragment_caching')
c.features.register('backdrop_content_elements')
c.features.register('custom_palette_colors')
Expand All @@ -224,11 +223,6 @@ def configure(config)
)
end

c.additional_frontend_seed_data.register(
'frontendVersion',
FRONTEND_VERSION_SEED_DATA
)

c.content_element_consent_vendors.register(
IFRAME_EMBED_CONSENT_VENDOR,
content_element_type_name: 'iframeEmbed'
Expand Down Expand Up @@ -260,13 +254,5 @@ def configure(config)

valid_providers.include?(provider) ? provider : nil
end

FRONTEND_VERSION_SEED_DATA = lambda do |request:, entry:, **|
if request.params[:frontend] == 'v2' || entry.feature_state('frontend_v2')
2
else
1
end
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {renderInEntryWithSectionLifecycle} from 'support';
import {useFakeMedia, fakeMediaRenderQueries} from 'support/fakeMedia';

import {frontend} from 'pageflow-scrolled/frontend';
import {Backdrop} from 'frontend/v1/Backdrop';
import {useBackdrop} from 'frontend/v1/useBackdrop';
import {Backdrop} from 'frontend/Backdrop';
import {useBackdrop} from 'frontend/useBackdrop';
import styles from 'frontend/Backdrop.module.css';

import {usePortraitOrientation} from 'frontend/usePortraitOrientation';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {getFilter} from 'frontend/v1/Backdrop/Effects';
import {getFilter} from 'frontend/Backdrop/Effects';

describe('Backdrop Effects getFilter', () => {
it('uses normalized range for brightness, contrast and saturate', () => {
Expand Down
2 changes: 1 addition & 1 deletion entry_types/scrolled/package/spec/frontend/Image-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {renderInEntry} from 'support';
import * as jsonLdQueries from 'support/jsonLdQueries';

import {Image} from 'frontend/Image';
import {useBackgroundFile} from 'frontend/v1/useBackgroundFile';
import {useBackgroundFile} from 'frontend/useBackgroundFile';
import {useFile} from 'entryState';

describe('Image', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import '@testing-library/jest-dom/extend-expect'
import {renderInEntry} from 'support';

import {useFile} from 'entryState';
import {useBackgroundFile} from 'frontend/v1/useBackgroundFile';
import {MotifArea} from 'frontend/v1/MotifArea';
import {useBackgroundFile} from 'frontend/useBackgroundFile';
import {MotifArea} from 'frontend/MotifArea';
import {MotifAreaVisibilityProvider} from 'frontend/MotifAreaVisibilityProvider';
import styles from 'frontend/MotifArea.module.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'support/mediaElementStub';
import {getInitialPlayerState, getPlayerActions} from 'support/fakePlayerState';

import {renderInEntry} from "../support";
import {useBackgroundFile} from 'frontend/v1/useBackgroundFile';
import {useBackgroundFile} from 'frontend/useBackgroundFile';
import {useFile} from 'entryState';
import {VideoPlayer} from 'frontend/VideoPlayer';
import {media, settings} from 'pageflow/frontend';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {viewTimelineStub} from 'support/viewTimelineStub';
import {animateStub} from 'support/animateStub';
import '@testing-library/jest-dom/extend-expect'

import effectsStyles from 'frontend/v1/Backdrop/Effects.module.css';
import effectsStyles from 'frontend/Backdrop/Effects.module.css';

import {usePortraitOrientation} from 'frontend/usePortraitOrientation';
jest.mock('frontend/usePortraitOrientation');
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import '@testing-library/jest-dom/extend-expect';

import {api} from 'frontend/api';

import {useMotifAreaState} from 'frontend/v1/useMotifAreaState';
jest.mock('frontend/v1/useMotifAreaState');
import {useMotifAreaState} from 'frontend/useMotifAreaState';
jest.mock('frontend/useMotifAreaState');

describe('constrainContentWidth', () => {
usePageObjects();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import {useInlineEditingPageObjects, renderEntry} from 'support/pageObjects';
import {fakeParentWindow} from 'support';
import {useMotifAreaState} from 'frontend/v1/useMotifAreaState';
import {useMotifAreaState} from 'frontend/useMotifAreaState';
import '@testing-library/jest-dom/extend-expect';

jest.mock('frontend/v1/useMotifAreaState');
jest.mock('frontend/useMotifAreaState');

describe('PaddingIndicator', () => {
useInlineEditingPageObjects();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import {act} from '@testing-library/react';
import '@testing-library/jest-dom/extend-expect';

import {usePortraitOrientation} from 'frontend/usePortraitOrientation';
import {useMotifAreaState} from 'frontend/v1/useMotifAreaState';
import {useMotifAreaState} from 'frontend/useMotifAreaState';
jest.mock('frontend/usePortraitOrientation');
jest.mock('frontend/v1/useMotifAreaState');
jest.mock('frontend/useMotifAreaState');

describe('section padding', () => {
useInlineEditingPageObjects();
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {useBackgroundFile} from 'frontend/v1/useBackgroundFile';
import {useBackgroundFile} from 'frontend/useBackgroundFile';
import {useFile} from 'entryState';

import {renderHookInEntry} from 'support';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {useMotifAreaState} from 'frontend/v1/useMotifAreaState';
import {useMotifAreaState} from 'frontend/useMotifAreaState';

import {renderHook, act} from '@testing-library/react-hooks';
import {fireEvent} from '@testing-library/dom'
Expand Down
Loading
Loading