Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-28787: As a Developer, I want to upgrade AlloyEditor to version 1.5.1 #337

Merged
merged 1 commit into from
Feb 7, 2018
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

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/bundle/Resources/public/js/alloyeditor/dist/ezBtnEmbed.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default class EzEmbedDiscoverContentButton extends EzWidgetButton {

ReactDOM.render(React.createElement(eZ.modules.UniversalDiscovery, {
onConfirm: this[this.props.udwContentDiscoveredMethod].bind(this),
onCancel: () => udwContainer.innerHTML = '',
onCancel: () => ReactDOM.unmountComponentAtNode(udwContainer),
confirmLabel: 'Select content',
title: this.props.udwTitle,
multiple: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class EzBtnEmbed extends EzEmbedDiscoverContentButton {
widget.renderEmbedPreview(items[0].ContentInfo.Content.Name);
widget.setFocused(true);

document.querySelector('#react-udw').innerHTML = '';
ReactDOM.unmountComponentAtNode(document.querySelector('#react-udw'));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default class EzBtnEmbedUpdate extends EzEmbedDiscoverContentButton {
widget.setWidgetContent("");
widget.renderEmbedPreview(items[0].ContentInfo.Content.Name);

document.querySelector('#react-udw').innerHTML = '';
ReactDOM.unmountComponentAtNode(document.querySelector('#react-udw'));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default class EzBtnImage extends EzEmbedImageButton {
widget.loadImagePreviewFromCurrentVersion(items[0].ContentInfo.Content.CurrentVersion._href);
widget.setFocused(true);

document.querySelector('#react-udw').innerHTML = '';
ReactDOM.unmountComponentAtNode(document.querySelector('#react-udw'));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default class EzBtnImageUpdate extends EzEmbedImageButton {
widget.setWidgetContent("");
widget.loadImagePreviewFromCurrentVersion(items[0].ContentInfo.Content.CurrentVersion._href);

document.querySelector('#react-udw').innerHTML = '';
ReactDOM.unmountComponentAtNode(document.querySelector('#react-udw'));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ export default class EzBtnLinkEdit extends Component {
);
this.focusEditedLink();

udwContainer.innerHTML = '';
ReactDOM.unmountComponentAtNode(udwContainer);
};

ReactDOM.render(React.createElement(eZ.modules.UniversalDiscovery, {
onConfirm: udwOnConfirm,
onCancel: () => udwContainer.innerHTML = '',
onCancel: () => ReactDOM.unmountComponentAtNode(udwContainer),
confirmLabel: 'Select content',
title: 'Select content',
multiple: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const udwContainer = doc.getElementById('react-udw');
const token = doc.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = doc.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const onConfirm = (btn, items) => {
closeUDW();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const udwContainer = doc.getElementById('react-udw');
const token = doc.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = doc.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const selectLocationsConfirm = (target, data) => {
const selectedItems = data.reduce((total, item) => total + `<li>${item.ContentInfo.Content.Name}</li>`, '');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const limitationsRadio = [...doc.querySelectorAll('.ez-limitations__radio')];
const token = doc.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = doc.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const selectSubtreeConfirm = (data) => {
const selectedItems = data.reduce((total, item) => total + `<li>${item.ContentInfo.Content.Name}</li>`, '');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const udwContainer = document.getElementById('react-udw');
const token = document.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const onConfirm = (form, content) => {
const field = form.querySelector('#' + form.getAttribute('name') + '_locations_location');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const udwContainer = document.getElementById('react-udw');
const token = document.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const onConfirm = (form, content) => {
const field = form.querySelector('#' + form.getAttribute('name') + '_locations_location');

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/js/scripts/admin.trash.list.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const udwContainer = document.getElementById('react-udw');
const token = document.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const onConfirm = (form, content) => {
const field = form.querySelector('#trash_item_restore_location_location');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
? parseInt(relationsContainer.dataset.defaultLocation, 10)
: window.eZ.adminUiConfig.universalDiscoveryWidget.startingLocationId;
const allowedContentTypes = relationsContainer.dataset.allowedContentTypes.split(',').filter(item => item.length);
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const renderRows = (items) => items.forEach((...args) => relationsContainer.insertAdjacentHTML('beforeend', renderRow(...args)));
const updateInputValue = (items) => {
sourceInput.value = items.join();
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/js/scripts/udw/browse.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const udwContainer = document.getElementById('react-udw');
const token = document.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const onConfirm = (items) => {
closeUDW();

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/js/scripts/udw/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
const udwContainer = document.getElementById('react-udw');
const token = document.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const onConfirm = (items) => {
closeUDW();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
const udwContainer = document.getElementById('react-udw');
const token = document.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const onConfirm = (items) => {
closeUDW();

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/js/scripts/udw/move.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
const udwContainer = document.getElementById('react-udw');
const token = document.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const onConfirm = (items) => {
closeUDW();

Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/js/scripts/udw/swap.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
const udwContainer = document.getElementById('react-udw');
const token = document.querySelector('meta[name="CSRF-Token"]').content;
const siteaccess = document.querySelector('meta[name="SiteAccess"]').content;
const closeUDW = () => udwContainer.innerHTML = '';
const closeUDW = () => ReactDOM.unmountComponentAtNode(udwContainer);
const onConfirm = (items) => {
closeUDW();

Expand Down
6 changes: 4 additions & 2 deletions src/bundle/Resources/views/layout.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@
</div>

{% javascripts
'bundles/ezplatformadminuiassets/vendors/react/dist/react.min.js'
'bundles/ezplatformadminuiassets/vendors/react-dom/dist/react-dom.min.js'
'bundles/ezplatformadminuiassets/vendors/react/umd/react.production.min.js'
'bundles/ezplatformadminuiassets/vendors/react-dom/umd/react-dom.production.min.js'
'bundles/ezplatformadminuiassets/vendors/jquery/dist/jquery.min.js'
'bundles/ezplatformadminuiassets/vendors/popper.js/dist/umd/popper.min.js'
'bundles/ezplatformadminuiassets/vendors/bootstrap/dist/js/bootstrap.min.js'
'bundles/ezplatformadminuiassets/vendors/create-react-class/create-react-class.min.js'
'bundles/ezplatformadminuiassets/vendors/prop-types/prop-types.min.js'
'bundles/ezplatformadminuiassets/vendors/alloyeditor/dist/alloy-editor/alloy-editor-no-react-min.js'
'bundles/ezplatformadminuimodules/js/UniversalDiscovery.module.js'
'bundles/ezplatformadminui/js/scripts/button.trigger.js'
Expand Down