remove harcoded tinymce. Fix #202
This commit is contained in:
@@ -174,9 +174,9 @@ class Coupon extends BaseAction implements EventSubscriberInterface
|
|||||||
|
|
||||||
// Set default condition if none found
|
// Set default condition if none found
|
||||||
/** @var ConditionInterface $noConditionRule */
|
/** @var ConditionInterface $noConditionRule */
|
||||||
$noConditionRule = $this->getContainer()->get('thelia.condition.match_for_everyone');
|
$noConditionRule = $this->noConditionRule;
|
||||||
/** @var ConditionFactory $conditionFactory */
|
/** @var ConditionFactory $conditionFactory */
|
||||||
$conditionFactory = $this->getContainer()->get('thelia.condition.factory');
|
$conditionFactory = $this->conditionFactory;
|
||||||
$couponRuleCollection = new ConditionCollection();
|
$couponRuleCollection = new ConditionCollection();
|
||||||
$couponRuleCollection[] = $noConditionRule;
|
$couponRuleCollection[] = $noConditionRule;
|
||||||
$defaultSerializedRule = $conditionFactory->serializeConditionCollection(
|
$defaultSerializedRule = $conditionFactory->serializeConditionCollection(
|
||||||
@@ -215,7 +215,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
|
|||||||
$coupon->setDispatcher($event->getDispatcher());
|
$coupon->setDispatcher($event->getDispatcher());
|
||||||
|
|
||||||
/** @var ConditionFactory $conditionFactory */
|
/** @var ConditionFactory $conditionFactory */
|
||||||
$conditionFactory = $this->getContainer()->get('thelia.condition.factory');
|
$conditionFactory = $this->conditionFactory;
|
||||||
|
|
||||||
$coupon->createOrUpdateConditions(
|
$coupon->createOrUpdateConditions(
|
||||||
$conditionFactory->serializeConditionCollection($event->getConditions()),
|
$conditionFactory->serializeConditionCollection($event->getConditions()),
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
{include file="include/tinymce_init.tpl"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{include file="include/tinymce_init.tpl"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{include file="include/tinymce_init.tpl"}
|
||||||
1
local/modules/Tinymce/AdminIncludes/image-edit-js.html
Normal file
1
local/modules/Tinymce/AdminIncludes/image-edit-js.html
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{include file="include/tinymce_init.tpl"}
|
||||||
@@ -41,25 +41,7 @@
|
|||||||
<script src="{$asset_url}"></script>
|
<script src="{$asset_url}"></script>
|
||||||
{/javascripts}
|
{/javascripts}
|
||||||
|
|
||||||
<script src="{url file='/tinymce/tinymce.min.js'}"></script>
|
|
||||||
<script>
|
<script>
|
||||||
tinymce.init({
|
|
||||||
selector: ".wysiwyg",
|
|
||||||
theme: "modern",
|
|
||||||
menubar : false,
|
|
||||||
language: "",
|
|
||||||
plugins: [
|
|
||||||
"advlist autolink link image lists charmap print preview hr anchor pagebreak",
|
|
||||||
"searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
|
|
||||||
"table contextmenu directionality emoticons paste textcolor filemanager"
|
|
||||||
],
|
|
||||||
toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor | print preview code ",
|
|
||||||
image_advtab: true ,
|
|
||||||
external_filemanager_path:"{url file='/tinymce/plugins/filemanager/'}'",
|
|
||||||
filemanager_title:"{intl l='Files manager'}" ,
|
|
||||||
external_plugins: { "filemanager" : "{url file='/tinymce/plugins/filemanager/plugin.min.js'}"}
|
|
||||||
});
|
|
||||||
|
|
||||||
$(function($){
|
$(function($){
|
||||||
// Url alowing to get coupon inputs
|
// Url alowing to get coupon inputs
|
||||||
$.couponManager.urlAjaxAdminCouponDrawInputs = "{$urlAjaxAdminCouponDrawInputs}";
|
$.couponManager.urlAjaxAdminCouponDrawInputs = "{$urlAjaxAdminCouponDrawInputs}";
|
||||||
|
|||||||
@@ -40,24 +40,7 @@
|
|||||||
<script src="{$asset_url}"></script>
|
<script src="{$asset_url}"></script>
|
||||||
{/javascripts}
|
{/javascripts}
|
||||||
|
|
||||||
<script src="{url file='/tinymce/tinymce.min.js'}"></script>
|
|
||||||
<script>
|
<script>
|
||||||
tinymce.init({
|
|
||||||
selector: ".wysiwyg",
|
|
||||||
theme: "modern",
|
|
||||||
menubar : false,
|
|
||||||
language: "",
|
|
||||||
plugins: [
|
|
||||||
"advlist autolink link image lists charmap print preview hr anchor pagebreak",
|
|
||||||
"searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
|
|
||||||
"table contextmenu directionality emoticons paste textcolor filemanager"
|
|
||||||
],
|
|
||||||
toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor | print preview code ",
|
|
||||||
image_advtab: true ,
|
|
||||||
external_filemanager_path:"{url file='/tinymce/plugins/filemanager/'}'",
|
|
||||||
filemanager_title:"{intl l='Files manager'}" ,
|
|
||||||
external_plugins: { "filemanager" : "{url file='/tinymce/plugins/filemanager/plugin.min.js'}"}
|
|
||||||
});
|
|
||||||
|
|
||||||
$(function($){
|
$(function($){
|
||||||
|
|
||||||
|
|||||||
@@ -140,26 +140,6 @@
|
|||||||
<script src="{$asset_url}"></script>
|
<script src="{$asset_url}"></script>
|
||||||
{/javascripts}
|
{/javascripts}
|
||||||
|
|
||||||
<script src="{url file='/tinymce/tinymce.min.js'}"></script>
|
|
||||||
<script>
|
|
||||||
tinymce.init({
|
|
||||||
selector: ".wysiwyg",
|
|
||||||
theme: "modern",
|
|
||||||
menubar : false,
|
|
||||||
language: "",
|
|
||||||
plugins: [
|
|
||||||
"advlist autolink link image lists charmap print preview hr anchor pagebreak",
|
|
||||||
"searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
|
|
||||||
"table contextmenu directionality emoticons paste textcolor filemanager"
|
|
||||||
],
|
|
||||||
toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor | print preview code ",
|
|
||||||
image_advtab: true ,
|
|
||||||
external_filemanager_path:"{url file='/tinymce/plugins/filemanager/'}'",
|
|
||||||
filemanager_title:"{intl l='Files manager'}" ,
|
|
||||||
external_plugins: { "filemanager" : "{url file='/tinymce/plugins/filemanager/plugin.min.js'}"}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{/block}
|
{/block}
|
||||||
|
|
||||||
{block name="javascript-last-call"}
|
{block name="javascript-last-call"}
|
||||||
|
|||||||
@@ -145,26 +145,6 @@
|
|||||||
<script src="{$asset_url}"></script>
|
<script src="{$asset_url}"></script>
|
||||||
{/javascripts}
|
{/javascripts}
|
||||||
|
|
||||||
<script src="{url file='/tinymce/tinymce.min.js'}"></script>
|
|
||||||
<script>
|
|
||||||
tinymce.init({
|
|
||||||
selector: ".wysiwyg",
|
|
||||||
theme: "modern",
|
|
||||||
menubar : false,
|
|
||||||
language: "",
|
|
||||||
plugins: [
|
|
||||||
"advlist autolink link image lists charmap print preview hr anchor pagebreak",
|
|
||||||
"searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
|
|
||||||
"table contextmenu directionality emoticons paste textcolor filemanager"
|
|
||||||
],
|
|
||||||
toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor | print preview code ",
|
|
||||||
image_advtab: true ,
|
|
||||||
external_filemanager_path:"{url file='/tinymce/plugins/filemanager/'}'",
|
|
||||||
filemanager_title:"{intl l='Files manager'}" ,
|
|
||||||
external_plugins: { "filemanager" : "{url file='/tinymce/plugins/filemanager/plugin.min.js'}"}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{/block}
|
{/block}
|
||||||
|
|
||||||
{block name="javascript-last-call"}
|
{block name="javascript-last-call"}
|
||||||
|
|||||||
Reference in New Issue
Block a user