Skip to content
Code-Schnipsel Gruppen Projekte
Commit 77802b5f erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'next-2.x' into 'main'

fix: use script text/plain method to insert snippets

See merge request !22
Übergeordnete 2bd180ca 5ad09bfe
No related branches found
No related tags found
2 Merge Requests!31Update 'next-3.x' with latest changes from 'main',!22fix: use script text/plain method to insert snippets
Pipeline #8695 bestanden mit Phase
in 57 Sekunden
......@@ -60,13 +60,18 @@ define('package/quiqqer/html-snippets/bin/backend/Snippets', [
$onImport: function() {
const Label = this.getElm().getParent('label');
const Parent = Label.parentNode;
Label.getElements('.field-container-item').destroy();
const Container = new Element('div', {
styles: {
width: '100%'
}
}).inject(Label);
});
Parent.appendChild(this.$Elm);
Parent.replaceChild(Container, Label);
SnippetUtils.isGDPRInstalled().then((isInstalled) => {
......@@ -99,13 +104,14 @@ define('package/quiqqer/html-snippets/bin/backend/Snippets', [
}
this.$Grid = new Grid(Container, {
height: Label.getParent('.qui-panel-content').getSize().y - 100,
height: Parent.getParent('.qui-panel-content').getSize().y - 100,
multipleSelection: true,
columnModel: columnModel,
buttons: [
{
name: 'add',
name: 'addSnippet',
text: QUILocale.get('quiqqer/core', 'add'),
position: 'left',
events: {
click: this.add
}
......@@ -178,7 +184,7 @@ define('package/quiqqer/html-snippets/bin/backend/Snippets', [
if (!this.$Project) {
return;
}
console.log(123);
require([
'package/quiqqer/html-snippets/bin/backend/controls/windows/AddSnippet'
], (AddSnippet) => {
......
......@@ -68,13 +68,14 @@ class SnippetTemplateEvent
}
// consider gdpr status
$div = '<div ';
$div = '<script ';
$div .= ' data-qui-html-snippet="gdpr"';
$div .= ' data-qui-html-snippet-gdpr-category="' . $snippet['gdpr'] . '"';
$div .= ' style="display: none"';
$div .= ' type="text/plain"';
$div .= '>';
$div .= base64_encode($snippet['snippet']);
$div .= '</div>';
$div .= '</script>';
$Collector->append($div);
}
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren