Skip to content

Commit

Permalink
9LTS
Browse files Browse the repository at this point in the history
  • Loading branch information
DirkPersky committed Oct 5, 2018
1 parent 0dd6454 commit 50abeff
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Configuration/RTE/PluginFA4.yaml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Configuration/RTE/PluginFA5.yaml
Expand Up @@ -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:
Expand Down
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Resources/Public/JavaScript/Plugins/ckeditor_fa/plugin.js
Expand Up @@ -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');
}
Expand Down
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Resources/Public/JavaScript/Plugins/ckeditor_fa5/plugin.js
Expand Up @@ -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');
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions ext_emconf.php
Expand Up @@ -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' => [
Expand Down

0 comments on commit 50abeff

Please sign in to comment.