Skip to content

LPD-64708 - Stop loading external resources #5068

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

LPD-64708 - Stop loading external resources #5068

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/apps/map/map-openstreetmap/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"dependencies": {
"@liferay/map-common": "*",
"frontend-js-web": "*"
"frontend-js-web": "*",
"leaflet": "1.7.1"
},
"main": "js/index.js",
"name": "@liferay/map-openstreetmap",
Expand Down
6 changes: 2 additions & 4 deletions modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/init.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@

<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>

<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %>
<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>

<%@ page import="com.liferay.portal.kernel.json.JSONFactoryUtil" %><%@
page import="com.liferay.portal.kernel.util.GetterUtil" %><%@
Expand Down
3 changes: 3 additions & 0 deletions ...s/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/MapOpenStreetMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
*/

import {MapBase} from '@liferay/map-common';
import L from 'leaflet';

import 'leaflet/dist/leaflet.css';

import OpenStreetMapDialog from './OpenStreetMapDialog';
import OpenStreetMapGeoJSON from './OpenStreetMapGeoJSON';
Expand Down
4 changes: 4 additions & 0 deletions ...pps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
* SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
*/

import L from 'leaflet';

import 'leaflet/dist/leaflet.css';

/**
* OpenStreetMapDialog
* @review
Expand Down
3 changes: 3 additions & 0 deletions ...ps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapGeoJSON.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
*/

import {GeoJSONBase} from '@liferay/map-common';
import L from 'leaflet';

import 'leaflet/dist/leaflet.css';

/**
* OpenStreetMapGeoJSONBase
Expand Down
3 changes: 3 additions & 0 deletions ...pps/map/map-openstreetmap/src/main/resources/META-INF/resources/js/OpenStreetMapMarker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
*/

import {MarkerBase} from '@liferay/map-common';
import L from 'leaflet';

import 'leaflet/dist/leaflet.css';

/**
* OpenStreetMapMarker
Expand Down
8 changes: 0 additions & 8 deletions modules/apps/map/map-openstreetmap/src/main/resources/META-INF/resources/view.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ String points = (String)request.getAttribute("liferay-map:map:points");
name = AUIUtil.getNamespace(liferayPortletRequest, liferayPortletResponse) + name;
%>

<liferay-util:html-top
outputKey="com.liferay.map.openstreetmap#/view.jsp"
>
<aui:link crossOrigin="anonymous" href="https://unpkg.com/[email protected]/dist/leaflet.css" integrity="sha384-VzLXTJGPSyTLX6d96AxgkKvE/LRb7ECGyTxuwtpjHnVWVZs2gp5RDjeM/tgBnVdM" rel="stylesheet" />

<aui:script crossOrigin="anonymous" integrity="sha384-RFZC58YeKApoNsIbBxf4z6JJXmh+geBSgkCQXFyh+4tiFSJmJBt+2FbjxW7Ar16M" src="https://unpkg.com/[email protected]/dist/leaflet.js" type="text/javascript"></aui:script>
</liferay-util:html-top>

<liferay-frontend:component
context='<%=
HashMapBuilder.<String, Object>put(
Expand Down