Skip to content

Commit

Permalink
rename package
Browse files Browse the repository at this point in the history
  • Loading branch information
goldfinch committed Feb 5, 2024
1 parent fa98d57 commit 975648f
Show file tree
Hide file tree
Showing 23 changed files with 131 additions and 131 deletions.
6 changes: 3 additions & 3 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
app/_config/html-components.yml
app/_config/html-snippets.yml
```
---
Name: app-html-components
After: "goldfinch/html-components"
Name: app-html-snippets
After: "goldfinch/html-snippets"
---
# Page:
# allowed_html_components:
Expand Down
6 changes: 3 additions & 3 deletions _config.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

use SilverStripe\View\Parsers\ShortcodeParser;
use Goldfinch\HTMLComponents\Shortcodes\HTMLComponentBlockShortcode;
use Goldfinch\HTMLSnippets\Shortcodes\HTMLSnippetBlockShortcode;

ShortcodeParser::get('default')->register('htmlcomponentblock', [
HTMLComponentBlockShortcode::class,
ShortcodeParser::get('default')->register('htmlsnippetblock', [
HTMLSnippetBlockShortcode::class,
'handle_shortcode',
]);
8 changes: 4 additions & 4 deletions _config/config.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
---
Name: goldfinch-html-components
Name: goldfinch-html-snippets
After:
- "#goldfinch-editor-config"
---
SilverStripe\Forms\HTMLEditor\HTMLEditorField:
extensions:
- Goldfinch\HTMLComponents\Extensions\HTMLEditorExtension
- Goldfinch\HTMLSnippets\Extensions\HTMLEditorExtension

SilverStripe\Admin\LeftAndMain:
extra_requirements_css:
- "goldfinch/html-components:client/dist/component.css"
- "goldfinch/html-snippets:client/dist/component.css"

SilverStripe\Forms\HTMLEditor\TinyMCEConfig:
editor_css:
- "goldfinch/html-components:client/dist/tinymce.css"
- "goldfinch/html-snippets:client/dist/tinymce.css"
4 changes: 2 additions & 2 deletions _config/route.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
Name: goldfinch-html-components-routes
Name: goldfinch-html-snippets-routes
After:
- "#rootroutes"
- "#coreroutes"
---
SilverStripe\Control\Director:
rules:
"api-html-components/component": Goldfinch\HTMLComponents\Controllers\HTMLComponentApiController
"api-html-snippets/component": Goldfinch\HTMLSnippets\Controllers\HTMLSnippetApiController
2 changes: 1 addition & 1 deletion client/dist/content-component.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions client/src/src/content-component.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const useFetch = async function (url, formData) {
return response.json();
};

tinymce.PluginManager.add('htmlcomponents', (editor, url) => {
tinymce.PluginManager.add('htmlsnippets', (editor, url) => {
let selectedComponent;
let componentTypes;
let componentObjects;
Expand Down Expand Up @@ -132,7 +132,7 @@ tinymce.PluginManager.add('htmlcomponents', (editor, url) => {
tinymce.activeEditor.execCommand(
'mceInsertContent',
false,
`[htmlcomponentblock class="gf-component" data-class="${selectedComponent}" data-id="${data.component}" data-bn="${componentTypes[ctKey].text}" data-n="${componentObjects[coKey].text}"].[/htmlcomponentblock]`,
`[htmlsnippetblock class="gf-component" data-class="${selectedComponent}" data-id="${data.component}" data-bn="${componentTypes[ctKey].text}" data-n="${componentObjects[coKey].text}"].[/htmlsnippetblock]`,
);

dialogApi.close();
Expand All @@ -150,7 +150,7 @@ tinymce.PluginManager.add('htmlcomponents', (editor, url) => {

try {
const data = await useFetch(
'/api-html-components/component/types',
'/api-html-snippets/component/types',
formData,
);

Expand Down Expand Up @@ -179,7 +179,7 @@ tinymce.PluginManager.add('htmlcomponents', (editor, url) => {

try {
const data = await useFetch(
'/api-html-components/component/objects',
'/api-html-snippets/component/objects',
formData,
);

Expand All @@ -194,7 +194,7 @@ tinymce.PluginManager.add('htmlcomponents', (editor, url) => {
} catch (error) {}
};

editor.ui.registry.addButton('htmlcomponents', {
editor.ui.registry.addButton('htmlsnippets', {
icon: 'sharpen',
onAction: async () => {
const dialogApi = editor.windowManager.open(window1);
Expand All @@ -205,15 +205,15 @@ tinymce.PluginManager.add('htmlcomponents', (editor, url) => {
},
});

const filter = 'div[data-shortcode="htmlcomponentblock"]';
const filter = 'div[data-shortcode="htmlsnippetblock"]';

editor.ui.registry.addButton('ccdelete', {
tooltip: 'Delete content block',
icon: 'remove',
onAction: () => editor.execCommand('cc-delete'),
});

editor.ui.registry.addContextToolbar('htmlcomponents', {
editor.ui.registry.addContextToolbar('htmlsnippets', {
predicate: (node) => editor.dom.is(node, filter),
position: 'node',
scope: 'node',
Expand Down Expand Up @@ -241,7 +241,7 @@ tinymce.PluginManager.add('htmlcomponents', (editor, url) => {
});

const shortCode = ShortcodeSerialiser.serialise({
name: 'htmlcomponentblock',
name: 'htmlsnippetblock',
properties,
wrapped: true,
content: '', // embed.html(),
Expand All @@ -256,7 +256,7 @@ tinymce.PluginManager.add('htmlcomponents', (editor, url) => {
editor.on('BeforeSetContent', (o) => {
let { content } = o;
// Transform [embed] tag
let match = ShortcodeSerialiser.match('htmlcomponentblock', true, content);
let match = ShortcodeSerialiser.match('htmlsnippetblock', true, content);

while (match) {
const data = match.properties;
Expand All @@ -267,19 +267,19 @@ tinymce.PluginManager.add('htmlcomponents', (editor, url) => {
.attr('data-class', data['data-class'])
.attr('data-n', data['data-n'])
.attr('data-bn', data['data-bn'])
.attr('data-shortcode', 'htmlcomponentblock')
.attr('data-shortcode', 'htmlsnippetblock')
.addClass(data.class);

base.html(
'<img src="/_resources/vendor/goldfinch/html-components/client/dist/images/component.svg" width="">',
'<img src="/_resources/vendor/goldfinch/html-snippets/client/dist/images/component.svg" width="">',
);

content = content.replace(
match.original,
jQuery('<div/>').append(base).html(),
);

match = ShortcodeSerialiser.match('htmlcomponentblock', true, content);
match = ShortcodeSerialiser.match('htmlsnippetblock', true, content);
}

o.content = content;
Expand All @@ -288,7 +288,7 @@ tinymce.PluginManager.add('htmlcomponents', (editor, url) => {
return {
getMetadata: () => ({
name: 'Goldfinch Components',
url: 'https://github.com/goldfinch/html-components',
url: 'https://github.com/goldfinch/html-snippets',
}),
};
});
18 changes: 9 additions & 9 deletions client/src/src/js/_plugins/customplugin2.js
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ tinymce.PluginManager.add('customplugin', (editor, url) => {
tinymce.activeEditor.execCommand(
'mceInsertContent',
false,
`[htmlcomponentblock class="gf-component" data-class="${savedComponent}" data-id="${data.component}" data-bn="${componentTypes[k1].text}" data-n="${componentObjects[k2].text}"].[/htmlcomponentblock]`,
`[htmlsnippetblock class="gf-component" data-class="${savedComponent}" data-id="${data.component}" data-bn="${componentTypes[k1].text}" data-n="${componentObjects[k2].text}"].[/htmlsnippetblock]`,
);

dialogApi.close();
Expand All @@ -339,7 +339,7 @@ tinymce.PluginManager.add('customplugin', (editor, url) => {

try {
const response = await fetch(
'/api-html-components/component/components',
'/api-html-snippets/component/components',
{
method: 'POST',
headers: {
Expand Down Expand Up @@ -398,7 +398,7 @@ tinymce.PluginManager.add('customplugin', (editor, url) => {

try {
const response = await fetch(
'/api-html-components/component/componentobjects',
'/api-html-snippets/component/componentobjects',
{
method: 'POST',
headers: {
Expand Down Expand Up @@ -477,7 +477,7 @@ tinymce.PluginManager.add('customplugin', (editor, url) => {
},
});

const filter = 'div[data-shortcode="htmlcomponentblock"]';
const filter = 'div[data-shortcode="htmlsnippetblock"]';

editor.ui.registry.addButton('gfcdelete', {
tooltip: 'Delete content block',
Expand Down Expand Up @@ -531,7 +531,7 @@ tinymce.PluginManager.add('customplugin', (editor, url) => {
console.log('properties', properties);

const shortCode = ShortcodeSerialiser.serialise({
name: 'htmlcomponentblock',
name: 'htmlsnippetblock',
properties,
wrapped: true,
content: '', // embed.html(),
Expand All @@ -551,7 +551,7 @@ tinymce.PluginManager.add('customplugin', (editor, url) => {
let { content } = o;
console.log('before set content', content);
// Transform [embed] tag
let match = ShortcodeSerialiser.match('htmlcomponentblock', true, content);
let match = ShortcodeSerialiser.match('htmlsnippetblock', true, content);
while (match) {
const data = match.properties;
console.log('data', data, match, data['data-id']);
Expand All @@ -563,9 +563,9 @@ tinymce.PluginManager.add('customplugin', (editor, url) => {
.attr('data-class', data['data-class'])
.attr('data-n', data['data-n'])
.attr('data-bn', data['data-bn'])
.attr('data-shortcode', 'htmlcomponentblock')
.attr('data-shortcode', 'htmlsnippetblock')
.addClass(data.class);
// .addClass('ss-htmleditorfield-file htmlcomponentblock');
// .addClass('ss-htmleditorfield-file htmlsnippetblock');

// Add placeholder
// const placeholder = jQuery('<img />')
Expand Down Expand Up @@ -599,7 +599,7 @@ tinymce.PluginManager.add('customplugin', (editor, url) => {
);

// Search for next match
match = ShortcodeSerialiser.match('htmlcomponentblock', true, content);
match = ShortcodeSerialiser.match('htmlsnippetblock', true, content);
}

// eslint-disable-next-line no-param-reassign
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "goldfinch/html-components",
"name": "goldfinch/html-snippets",
"description": "",
"type": "silverstripe-vendormodule",
"keywords": ["silverstripe"],
"keywords": ["silverstripe", "html-snippets", "html-blocks"],
"license": "MIT",
"authors": [
{
Expand All @@ -20,7 +20,7 @@
},
"autoload": {
"psr-4": {
"Goldfinch\\HTMLComponents\\": "src/"
"Goldfinch\\HTMLSnippets\\": "src/"
}
},
"extra": {
Expand Down
Loading

0 comments on commit 975648f

Please sign in to comment.