Skip to content

Commit

Permalink
Update to Froala 2.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Guionniere committed Mar 15, 2017
1 parent b4bf57a commit 2fa225f
Show file tree
Hide file tree
Showing 238 changed files with 30,671 additions and 11 deletions.
18 changes: 10 additions & 8 deletions Form/Type/FroalaEditorType.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ public function __construct( Kernel $p_kernel, ContainerInterface $p_container,
$this->m_container = $p_container;
$this->m_optionManager = $p_optionManager;
$this->m_pluginProvider = $p_pluginProvider;

$this->m_version = $p_kernel::MAJOR_VERSION;
$this->m_version = $p_kernel::MAJOR_VERSION;
}

// -------------------------------------------------------------//
Expand Down Expand Up @@ -128,12 +127,15 @@ public function buildView( FormView $p_view, FormInterface $p_form, array $p_opt
$p_view->vars [ "arrOption" ] = $arrOption;

// Plugins.
$arrPlugin = $this->m_pluginProvider->obtainArrPluginToInclude( $arrPluginEnabled, //
$arrPluginDisabled );

$p_view->vars [ "arrOption" ][ "pluginsEnabled" ] = $this->m_pluginProvider->obtainArrPluginCamelized( $arrPlugin );
$p_view->vars [ "arrPluginJS" ] = $this->m_pluginProvider->obtainArrPluginJS( $arrPlugin );
$p_view->vars [ "arrPluginCSS" ] = $this->m_pluginProvider->obtainArrPluginCSS( $arrPlugin );
$arrPlugin = $this->m_pluginProvider->obtainArrPluginToInclude( $arrPluginEnabled, //
$arrPluginDisabled );

$p_view->vars [ "arrOption" ][ "pluginsEnabled" ] =
$this->m_pluginProvider->obtainArrPluginCamelized( $arrPlugin );
$p_view->vars [ "arrPluginJS" ] =
$this->m_pluginProvider->obtainArrPluginJS( $arrPlugin );
$p_view->vars [ "arrPluginCSS" ] =
$this->m_pluginProvider->obtainArrPluginCSS( $arrPlugin );
}

/**
Expand Down
5 changes: 5 additions & 0 deletions Resources/public/froala_editor_2.5.1/License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Froala WYSIWYG Editor
================

In order to use Froala Editor you have to purchase a license from: https://www.froala.com/wysiwyg-editor/pricing.
For more informations regarding the license please read https://www.froala.com/wysiwyg-editor/terms.
87 changes: 87 additions & 0 deletions Resources/public/froala_editor_2.5.1/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
{
"name": "froala-wysiwyg-editor",
"description": "A beautiful jQuery WYSIWYG HTML rich text editor. High performance and modern design make it easy to use for developers and loved by users.",
"homepage": "https://www.froala.com/wysiwyg-editor",
"license": "https://www.froala.com/wysiwyg-editor/pricing",
"repository": {
"type": "git",
"url": "git://github.com/froala/wysiwyg-editor.git"
},
"keywords": [
"froala",
"froala-editor",
"froala-wysiwyg",
"html",
"text",
"editor",
"wysiwyg",
"jquery-plugin",
"rich editor",
"rich text editor",
"rte",
"javascript",
"jquery"
],
"moduleType": "globals",
"main": [
"css/froala_editor.min.css",
"css/froala_editor.pkgd.min.css",
"css/froala_style.min.css",
"css/plugins/char_counter.min.css",
"css/plugins/code_view.min.css",
"css/plugins/colors.min.css",
"css/plugins/draggable.min.css",
"css/plugins/emoticons.min.css",
"css/plugins/file.min.css",
"css/plugins/fullscreen.min.css",
"css/plugins/help.min.css",
"css/plugins/image_manager.min.css",
"css/plugins/image.min.css",
"css/plugins/line_breaker.min.css",
"css/plugins/quick_insert.min.css",
"css/plugins/special_characters.min.css",
"css/plugins/table.min.css",
"css/plugins/video.min.css",
"js/froala_editor.min.js",
"js/froala_editor.pkgd.min.js",
"js/plugins/align.min.js",
"js/plugins/char_counter.min.js",
"js/plugins/code_beautifier.min.js",
"js/plugins/code_view.min.js",
"js/plugins/colors.min.js",
"js/plugins/draggable.min.js",
"js/plugins/emoticons.min.js",
"js/plugins/entities.min.js",
"js/plugins/file.min.js",
"js/plugins/font_family.min.js",
"js/plugins/font_size.min.js",
"js/plugins/fullscreen.min.js",
"js/plugins/help.min.js",
"js/plugins/image.min.js",
"js/plugins/image_manager.min.js",
"js/plugins/inline_style.min.js",
"js/plugins/line_breaker.min.js",
"js/plugins/link.min.js",
"js/plugins/lists.min.js",
"js/plugins/paragraph_format.min.js",
"js/plugins/paragraph_style.min.js",
"js/plugins/print.min.js",
"js/plugins/quick_insert.min.js",
"js/plugins/quote.min.js",
"js/plugins/save.min.js",
"js/plugins/special_characters.min.js",
"js/plugins/table.min.js",
"js/plugins/url.min.js",
"js/plugins/video.min.js",
"js/plugins/word_paste.min.js"
],
"ignore": [
"html",
"img",
"package.json"
],
"dependencies": {
"jquery": ">=1.11.0",
"font-awesome": ">=4.4.0"
}
}
31 changes: 31 additions & 0 deletions Resources/public/froala_editor_2.5.1/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "froala/wysiwyg-editor",
"description": "A beautiful jQuery WYSIWYG HTML rich text editor. High performance and modern design make it easy to use for developers and loved by users.",
"type": "component",
"homepage": "https://www.froala.com/wysiwyg-editor",
"license": "proprietary",
"support": {
"issues": "https://www.froala.com/wysiwyg-editor/contact"
},
"keywords": [
"froala",
"froala-editor",
"froala-wysiwyg",
"html",
"text",
"editor",
"wysiwyg",
"jquery-plugin",
"rich editor",
"rich text editor",
"rte",
"javascript",
"jquery"
],
"authors": [
{
"name": "Froala Labs",
"email": "[email protected]"
}
]
}
Loading

0 comments on commit 2fa225f

Please sign in to comment.