upgrad sf 2.8

ibrows · Mar 8, 2016 · 0e231e4 · 0e231e4
1 parent 0162d80
commit 0e231e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
@@ -78,7 +78,7 @@
 
             <script type="text/javascript">
                 var $newsletter = new ibrows_newsletter.newsletter({
-                    tinymceButtons: {{ tinymceCustomButtons|default()|raw }},
+                    tinymceButtons: {{ tinymceCustomButtons|default('[]')|raw }},
                     selectors: {
                         iframeAutoheight: '[data-iframe-auto-height="true"]'
                     }
@@ -137,7 +137,6 @@
             {% block newsletter_content %}{% endblock newsletter_content %}
         </div>
 
+        {{ tinymce_init() }}
     </body>
 </html>
-
-{{ tinymce_init() }}
diff --git a/composer.json b/composer.json
@@ -15,10 +15,9 @@
 			"email": "mike.meier@ibrows.ch"
 		}
 	],
-	"minimum-stability": "stable",
 	"require": {
-		"symfony/symfony": ">=2.1",
-        "stfalcon/tinymce-bundle": "*"
+		"symfony/symfony": ">=2.8",
+		"stfalcon/tinymce-bundle": "^0.4"
     },
     "autoload": {
         "psr-4": { "Ibrows\\Bundle\\NewsletterBundle\\": "" }