From d46583f824c53e3dfaa6a91643f434bb8bbb6d50 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Tue, 13 Aug 2013 03:03:44 +0200
Subject: [PATCH] Add tinymce

---
 .travis.yml                         |  2 +-
 Gruntfile.js                        | 15 ++++++++++++++-
 bower.json                          |  3 ++-
 templates/web/admin/index.html.twig |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 808ff084cc..ec8b90d0c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_script:
   - node --version
   - npm --version
   - npm install
-  - npm install grunt-cli -g
+  - npm install grunt-cli jake -g
   - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
   - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
   - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then pecl install redis; fi;'
diff --git a/Gruntfile.js b/Gruntfile.js
index 133640aba7..29816e814d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -22,7 +22,8 @@ module.exports = function(grunt) {
                     components: {
                         "jquery.ui": ["npm", {"grunt": "build"}],
                         "bootstrap": ["npm", {"make": "bootstrap"}],
-                        "jquery-mobile": ["npm", {"make": "all"}]
+                        "jquery-mobile": ["npm", {"make": "all"}],
+                        "tinymce": ["npm", "jake"]
                     }
                 }
             }
@@ -223,6 +224,18 @@ module.exports = function(grunt) {
                 "dest": "www/assets/swfobject",
                 "flatten": true
             },
+            "tinymce": {
+                "expand": true,
+                "cwd": "assets/tinymce/js/tinymce",
+                "src": [
+                    "plugins/**",
+                    "skins/**",
+                    "themes/**",
+                    "tinymce.js",
+                    "license.txt"
+                ],
+                "dest": "www/assets/tinymce"
+            },
             "underscore": {
                 "expand": true,
                 "src": [
diff --git a/bower.json b/bower.json
index d6fe100bd6..c8a170edc4 100644
--- a/bower.json
+++ b/bower.json
@@ -25,6 +25,7 @@
     "bootstrap-multiselect": "https://github.com/davidstutz/bootstrap-multiselect.git",
     "zxcvbn" : "https://github.com/lowe/zxcvbn.git",
     "geonames-server-jquery-plugin" : "~0.2",
-    "swfobject" : "latest"
+    "swfobject" : "latest",
+    "tinymce" : "~4.0"
   }
 }
diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig
index bd5fbbfcf2..ecc55dc671 100644
--- a/templates/web/admin/index.html.twig
+++ b/templates/web/admin/index.html.twig
@@ -15,7 +15,7 @@
 {% block javascript %}
   {% include "common/templates.html.twig" %}
   {# note: Tinymce must be include here without minify else URL resolution for tinymce plugins will fail #}
-  <script type="text/javascript" src="/include/tinymce/js/tinymce/tinymce.min.js"></script>
+  <script type="text/javascript" src="/assets/tinymce/tinymce.js"></script>
   <script type="text/javascript" src="{{ path('minifier', { 'g' : 'admin' }) }}"></script>
   <script type="text/javascript">
     var p4 = {users:{sel:[]}};