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.

Sign up for GitHub

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

Jump to bottom

Remove {append, buildFragment, enterDocument} usages of metal-dom WIP #463

Closed
wants to merge 1 commit into from
Closed

Remove {append, buildFragment, enterDocument} usages of metal-dom WIP #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...s/frontend-js-spa-web/src/main/resources/META-INF/resources/liferay/surface/Surface.es.js
View file
Open in desktop
Expand Up @@ -13,7 +13,6 @@
*/

import core from 'metal';
import dom from 'metal-dom';
import Surface from 'senna/lib/surface/Surface';

/**
Expand All @@ -31,7 +30,7 @@ class LiferaySurface extends Surface {

addContent(screenId, content) {
if (core.isString(content)) {
content = dom.buildFragment(content);
content = document.createRange().createContextualFragment(content);
}

Liferay.DOMTaskRunner.runTasks(content);
Expand Down
7 changes: 5 additions & 2 deletions ...js/frontend-js-web/src/main/resources/META-INF/resources/liferay/compat/modal/Modal.es.js
View file
Open in desktop
Expand Up @@ -231,8 +231,11 @@ class Modal extends Component {
*/

_valueOverlayElementFn() {
return dom.buildFragment('<div class="modal-backdrop fade show"></div>')
.firstChild;
return document
.createRange()
.createContextualFragment(
'<div class="modal-backdrop fade show"></div>'
).firstChild;
}
}

Expand Down
7 changes: 3 additions & 4 deletions ...ntend-js-web/src/main/resources/META-INF/resources/liferay/toast/commands/OpenToast.es.js
View file
Open in desktop
Expand Up @@ -14,7 +14,6 @@

import ClayAlert from '@clayui/alert';
import {render} from 'frontend-js-react-web';
import {buildFragment} from 'metal-dom';
import React from 'react';
import {unmountComponentAtNode} from 'react-dom';

Expand Down Expand Up @@ -55,9 +54,9 @@ const getRootElement = ({container, containerId}) => {
let alertFixed = document.getElementById(DEFAULT_ALERT_CONTAINER_ID);

if (!alertFixed) {
alertFixed = buildFragment(TPL_ALERT_CONTAINER).querySelector(
'.alert-container.container'
);
alertFixed = document
.createRange()
.createContextualFragment(TPL_ALERT_CONTAINER).firstChild;

alertFixed = document.body.appendChild(alertFixed);
}
Expand Down
14 changes: 8 additions & 6 deletions modules/apps/frontend-js/frontend-js-web/test/liferay/util/form/get_form_element.es.js
View file
Open in desktop
Expand Up @@ -14,13 +14,13 @@

'use strict';

import dom from 'metal-dom';

import getFormElement from '../../../../src/main/resources/META-INF/resources/liferay/util/form/get_form_element.es';

describe('Liferay.Util.getFormElement', () => {
it('returns null if the form parameter is not a form node', () => {
const fragment = dom.buildFragment('<div />');
const fragment = document
.createRange()
.createContextualFragment('<div />');

const form = fragment.firstElementChild;

Expand All @@ -29,7 +29,9 @@ describe('Liferay.Util.getFormElement', () => {
});

it('returns null if the elementName parameter is not a string', () => {
const fragment = dom.buildFragment('<form />');
const fragment = document
.createRange()
.createContextualFragment('<form />');

const form = fragment.firstElementChild;

Expand All @@ -38,7 +40,7 @@ describe('Liferay.Util.getFormElement', () => {
});

it('returns null if the element does not exist withing the form', () => {
const fragment = dom.buildFragment(`
const fragment = document.createRange().createContextualFragment(`
<form data-fm-namespace="_com_liferay_test_portlet_" id="fm">
<input name="_com_liferay_test_portlet_foo" type="text" value="abc">
</form>
Expand All @@ -50,7 +52,7 @@ describe('Liferay.Util.getFormElement', () => {
});

it('returns element value if the element does exist withing the form', () => {
const fragment = dom.buildFragment(`
const fragment = document.createRange().createContextualFragment(`
<form data-fm-namespace="_com_liferay_test_portlet_" id="fm">
<input name="_com_liferay_test_portlet_foo" type="text" value="abc">
</form>
Expand Down
20 changes: 13 additions & 7 deletions modules/apps/frontend-js/frontend-js-web/test/liferay/util/form/post_form.es.js
View file
Open in desktop
Expand Up @@ -14,8 +14,6 @@

'use strict';

import dom from 'metal-dom';

import getFormElement from '../../../../src/main/resources/META-INF/resources/liferay/util/form/get_form_element.es';
import postForm from '../../../../src/main/resources/META-INF/resources/liferay/util/form/post_form.es';

Expand All @@ -29,7 +27,9 @@ describe('Liferay.Util.postForm', () => {
});

it('does nothing if the form parameter is not a form node', () => {
const fragment = dom.buildFragment('<div />');
const fragment = document
.createRange()
.createContextualFragment('<div />');

postForm(undefined);
postForm(fragment.firstElementChild);
Expand All @@ -38,7 +38,9 @@ describe('Liferay.Util.postForm', () => {
});

it('submits form even if options parameter is not set', () => {
const fragment = dom.buildFragment('<form />');
const fragment = document
.createRange()
.createContextualFragment('<form />');

const form = fragment.firstElementChild;

Expand All @@ -48,7 +50,9 @@ describe('Liferay.Util.postForm', () => {
});

it('does nothing if the url optional parameter is not a string', () => {
const fragment = dom.buildFragment('<form />');
const fragment = document
.createRange()
.createContextualFragment('<form />');

const form = fragment.firstElementChild;

Expand All @@ -59,7 +63,9 @@ describe('Liferay.Util.postForm', () => {
});

it('does nothing if the data optional parameter is not an object', () => {
const fragment = dom.buildFragment('<form />');
const fragment = document
.createRange()
.createContextualFragment('<form />');

const form = fragment.firstElementChild;

Expand All @@ -70,7 +76,7 @@ describe('Liferay.Util.postForm', () => {
});

it('sets given element values in data parameter, and submit form to a given url', () => {
const fragment = dom.buildFragment(`
const fragment = document.createRange().createContextualFragment(`
<form data-fm-namespace="_com_liferay_test_portlet_" id="fm">
<input name="_com_liferay_test_portlet_foo" type="text" value="abc">
<input name="_com_liferay_test_portlet_bar" type="text" value="123">
Expand Down
4 changes: 1 addition & 3 deletions modules/apps/frontend-js/frontend-js-web/test/liferay/util/form/set_form_values.es.js
View file
Open in desktop
Expand Up @@ -14,14 +14,12 @@

'use strict';

import dom from 'metal-dom';

import getFormElement from '../../../../src/main/resources/META-INF/resources/liferay/util/form/get_form_element.es';
import setFormValues from '../../../../src/main/resources/META-INF/resources/liferay/util/form/set_form_values.es';

describe('Liferay.Util.setFormValues', () => {
it('sets the given values of form elements', () => {
const fragment = dom.buildFragment(`
const fragment = document.createRange().createContextualFragment(`
<form data-fm-namespace="_com_liferay_test_portlet_" id="fm">
<input name="_com_liferay_test_portlet_foo" type="text" value="abc">
<input name="_com_liferay_test_portlet_bar" type="text" value="123">
Expand Down
6 changes: 3 additions & 3 deletions modules/apps/frontend-js/frontend-js-web/test/liferay/util/get_crop_region.es.js
View file
Open in desktop
Expand Up @@ -14,8 +14,6 @@

'use strict';

import dom from 'metal-dom';

import getCropRegion from '../../../src/main/resources/META-INF/resources/liferay/util/get_crop_region.es';

describe('Liferay.Util.getCropRegion', () => {
Expand All @@ -39,7 +37,9 @@ describe('Liferay.Util.getCropRegion', () => {
});

it('throws an error if image parameter is not an image element', () => {
const image = dom.buildFragment('<div />');
const image = document
.createRange()
.createContextualFragment('<div />');

const region = {
height: 100,
Expand Down
15 changes: 8 additions & 7 deletions modules/apps/map/map-common/src/main/resources/META-INF/resources/js/MapBase.es.js
View file
Open in desktop
Expand Up @@ -12,7 +12,6 @@
* details.
*/

import {buildFragment} from 'metal-dom';
import State, {Config} from 'metal-state';

import GeoJSONBase from './GeoJSONBase.es';
Expand Down Expand Up @@ -213,9 +212,10 @@ class MapBase extends State {
const customControls = {};

if (controls.indexOf(this.constructor.CONTROLS.HOME) !== -1) {
const homeControl = buildFragment(TPL_HOME_BUTTON).querySelector(
'.btn.btn-secondary.home-button'
);
const homeControl = document
.createRange()
.createContextualFragment(TPL_HOME_BUTTON)
.querySelector('.btn.btn-secondary.home-button');
customControls[this.constructor.CONTROLS.HOME] = homeControl;
this.addControl(
homeControl,
Expand All @@ -227,9 +227,10 @@ class MapBase extends State {
controls.indexOf(this.constructor.CONTROLS.SEARCH) !== -1 &&
this.constructor.SearchImpl
) {
const searchControl = buildFragment(TPL_SEARCH_BOX).querySelector(
'div.col-md-6.search-controls'
);
const searchControl = document
.createRange()
.createContextualFragment(TPL_SEARCH_BOX)
.querySelector('div.col-md-6.search-controls');
customControls[
this.constructor.CONTROLS.SEARCH
] = new this.constructor.SearchImpl({
Expand Down