From 50abeffbaa51857d82bfb58c08b1d738bf3912af Mon Sep 17 00:00:00 2001 From: Dirk Persky Date: Fri, 5 Oct 2018 15:08:21 +0200 Subject: [PATCH] 9LTS --- Configuration/RTE/PluginFA4.yaml | 2 +- Configuration/RTE/PluginFA5.yaml | 2 +- .../JavaScript/Plugins/ckeditor_fa/dialogs/ckeditor-fa.js | 2 +- Resources/Public/JavaScript/Plugins/ckeditor_fa/plugin.js | 4 ++-- .../JavaScript/Plugins/ckeditor_fa5/dialogs/ckeditor-fa.js | 2 +- Resources/Public/JavaScript/Plugins/ckeditor_fa5/plugin.js | 4 ++-- composer.json | 2 +- ext_emconf.php | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Configuration/RTE/PluginFA4.yaml b/Configuration/RTE/PluginFA4.yaml index b7dc30f..6df8a23 100644 --- a/Configuration/RTE/PluginFA4.yaml +++ b/Configuration/RTE/PluginFA4.yaml @@ -2,7 +2,7 @@ editor: externalPlugins: ckeditor_fa: - resource: "EXT:rte_ckeditor_fontawesome/Resources/Public/JavaScript/Plugins/ckeditor_fa/plugin.js?v=9.3.0" + resource: "EXT:rte_ckeditor_fontawesome/Resources/Public/JavaScript/Plugins/ckeditor_fa/plugin.js?v=9.5.0" config: coreStyles_italic: diff --git a/Configuration/RTE/PluginFA5.yaml b/Configuration/RTE/PluginFA5.yaml index 57e6755..eddda95 100644 --- a/Configuration/RTE/PluginFA5.yaml +++ b/Configuration/RTE/PluginFA5.yaml @@ -2,7 +2,7 @@ editor: externalPlugins: ckeditor_fa5: - resource: "EXT:rte_ckeditor_fontawesome/Resources/Public/JavaScript/Plugins/ckeditor_fa5/plugin.js?v=9.3.0" + resource: "EXT:rte_ckeditor_fontawesome/Resources/Public/JavaScript/Plugins/ckeditor_fa5/plugin.js?v=9.5.0" config: coreStyles_italic: diff --git a/Resources/Public/JavaScript/Plugins/ckeditor_fa/dialogs/ckeditor-fa.js b/Resources/Public/JavaScript/Plugins/ckeditor_fa/dialogs/ckeditor-fa.js index d5d8093..fd27f4d 100644 --- a/Resources/Public/JavaScript/Plugins/ckeditor_fa/dialogs/ckeditor-fa.js +++ b/Resources/Public/JavaScript/Plugins/ckeditor_fa/dialogs/ckeditor-fa.js @@ -52,7 +52,7 @@ function searchFontawesomeIcon(el) { CKEDITOR.dialog.add('ckeditorFaDialog', function (editor) { function ckeditorFaGetIcons() { $.ajaxSetup({async: false}); - var icons = $.get(CKEDITOR.plugins.getPath('ckeditor_fa')+'dialogs/index.html?v=9.3.0'); + var icons = $.get(CKEDITOR.plugins.getPath('ckeditor_fa')+'dialogs/index.html?v=9.5.0'); $.ajaxSetup({async: true}); if (icons.status == 200) { return icons.responseText; diff --git a/Resources/Public/JavaScript/Plugins/ckeditor_fa/plugin.js b/Resources/Public/JavaScript/Plugins/ckeditor_fa/plugin.js index 7914f31..3b89cb0 100644 --- a/Resources/Public/JavaScript/Plugins/ckeditor_fa/plugin.js +++ b/Resources/Public/JavaScript/Plugins/ckeditor_fa/plugin.js @@ -15,8 +15,8 @@ toolbar: 'insert', icon: this.path + 'icons/ckeditor-fa.png', }); - CKEDITOR.dialog.add('ckeditorFaDialog', this.path + 'dialogs/ckeditor-fa.js?v=9.3.0'); - CKEDITOR.document.appendStyleSheet(this.path + 'css/ckeditor-fa.css?v=9.3.0'); + CKEDITOR.dialog.add('ckeditorFaDialog', this.path + 'dialogs/ckeditor-fa.js?v=9.5.0'); + CKEDITOR.document.appendStyleSheet(this.path + 'css/ckeditor-fa.css?v=9.5.0'); editor.addContentsCss('https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css'); } diff --git a/Resources/Public/JavaScript/Plugins/ckeditor_fa5/dialogs/ckeditor-fa.js b/Resources/Public/JavaScript/Plugins/ckeditor_fa5/dialogs/ckeditor-fa.js index eccedb6..df55f36 100644 --- a/Resources/Public/JavaScript/Plugins/ckeditor_fa5/dialogs/ckeditor-fa.js +++ b/Resources/Public/JavaScript/Plugins/ckeditor_fa5/dialogs/ckeditor-fa.js @@ -53,7 +53,7 @@ function searchFontawesomeIcon(el) { CKEDITOR.dialog.add('ckeditorFaDialog', function (editor) { function ckeditorFaGetIcons() { $.ajaxSetup({async: false}); - var icons = $.get(CKEDITOR.plugins.getPath('ckeditor_fa5') + 'dialogs/index.html?v=9.3.0'); + var icons = $.get(CKEDITOR.plugins.getPath('ckeditor_fa5') + 'dialogs/index.html?v=9.5.0'); $.ajaxSetup({async: true}); if (icons.status == 200) { return icons.responseText; diff --git a/Resources/Public/JavaScript/Plugins/ckeditor_fa5/plugin.js b/Resources/Public/JavaScript/Plugins/ckeditor_fa5/plugin.js index 5715490..24769fc 100644 --- a/Resources/Public/JavaScript/Plugins/ckeditor_fa5/plugin.js +++ b/Resources/Public/JavaScript/Plugins/ckeditor_fa5/plugin.js @@ -15,8 +15,8 @@ toolbar: 'insert', icon: this.path + 'icons/ckeditor-fa.png', }); - CKEDITOR.dialog.add('ckeditorFaDialog', this.path + 'dialogs/ckeditor-fa.js?v=9.3.0'); - CKEDITOR.document.appendStyleSheet(this.path + 'css/ckeditor-fa.css?v=9.3.0'); + CKEDITOR.dialog.add('ckeditorFaDialog', this.path + 'dialogs/ckeditor-fa.js?v=9.5.0'); + CKEDITOR.document.appendStyleSheet(this.path + 'css/ckeditor-fa.css?v=9.5.0'); editor.addContentsCss('https://use.fontawesome.com/releases/v5.0.6/css/all.css'); } diff --git a/composer.json b/composer.json index 75a070a..423bc39 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "GPL-3.0-or-later" ], "require": { - "typo3/cms-core": "~8.7.0||~9.3.0||dev-master" + "typo3/cms-core": "~8.7.0||~9.3.0||~9.5.0||dev-master" }, "replace": { "rte_ckeditor_fontawesome": "self.version", diff --git a/ext_emconf.php b/ext_emconf.php index 7d699e4..1629c1d 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -9,11 +9,11 @@ 'clearCacheOnLoad' => 0, 'author' => 'Dirk Persky', 'author_email' => 'd.persky@gutenberghaus.de', - 'version' => '9.3.0', + 'version' => '9.5.0', 'constraints' => [ 'depends' => [ - 'typo3' => '8.7.0-9.3.99', - 'rte_ckeditor' => '8.7.0-9.3.99', + 'typo3' => '8.7.0-9.5.99', + 'rte_ckeditor' => '8.7.0-9.5.99', ], 'conflicts' => [], 'suggests' => [