From a0dda3ebe72c2ecec02e4fdf937e2e27f3bee5cb Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 8 Jan 2013 19:17:12 +0100
Subject: [PATCH] Fix #1059 : Remove tinyMCE as dependency

---
 templates/web/common/dialog_export.twig   | 6 +++---
 templates/web/lightbox/IE6/feed.twig      | 1 -
 templates/web/lightbox/IE6/validate.twig  | 1 -
 templates/web/lightbox/feed.twig          | 1 -
 templates/web/lightbox/validate.twig      | 1 -
 templates/web/prod/index.html.twig        | 1 -
 www/client/index.php                      | 1 -
 www/client/jquery.p4client.1.0.js         | 6 ------
 www/prod/page0.js                         | 6 ------
 www/skins/lightbox/jquery.lightbox.ie6.js | 6 ------
 www/skins/lightbox/jquery.lightbox.js     | 6 ------
 11 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/templates/web/common/dialog_export.twig b/templates/web/common/dialog_export.twig
index cc01c8aec7..e2b5b7a85a 100644
--- a/templates/web/common/dialog_export.twig
+++ b/templates/web/common/dialog_export.twig
@@ -184,7 +184,7 @@
                         </div>
                         <div>
                             <p>{% trans 'export::mail: contenu du mail' %}</p>
-                            <textarea rows="10" style="width:100%; white-space:pre;" name="textmail" id="sendmail_message"></textarea>
+                            <textarea rows="6" style="width:90%; white-space:pre;resize:none;" name="textmail" id="sendmail_message"></textarea>
                         </div>
                         <div>
                             <p>{% trans 'export::mail: fichiers joint' %}</p>
@@ -261,7 +261,7 @@
                                     {% trans 'commande::utilisation prevue' %}
                                 </td>
                                 <td>
-                                    <textarea style="width:250px;" rows="5" name="use" id="order_usage"></textarea>
+                                    <textarea style="width:250px;resize:none;" rows="5" name="use" id="order_usage"></textarea>
                                 </td>
                             </tr>
                             <tr>
@@ -676,7 +676,7 @@
                     return false;
                 }
 
-                var options = $('#order form').serialize()+'&action=ORDER&use='+escape(tinyMCE.get('order_usage').getContent());
+                var options = $('#order form').serialize() + '&action=ORDER';
 
                 var $this = $(this);
                 $this.attr('disabled','disabled');
diff --git a/templates/web/lightbox/IE6/feed.twig b/templates/web/lightbox/IE6/feed.twig
index e799049f4e..a6622d0937 100644
--- a/templates/web/lightbox/IE6/feed.twig
+++ b/templates/web/lightbox/IE6/feed.twig
@@ -7,7 +7,6 @@
     <script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script>
     <script type="text/javascript" src="/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
         <script type="text/javascript" src="/include/minify/g=lightboxie6"></script>
-        <script type="text/javascript" src="include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
 {% endblock %}
 
 {% block stylesheet %}
diff --git a/templates/web/lightbox/IE6/validate.twig b/templates/web/lightbox/IE6/validate.twig
index 6523eb960d..44c07d9cad 100644
--- a/templates/web/lightbox/IE6/validate.twig
+++ b/templates/web/lightbox/IE6/validate.twig
@@ -7,7 +7,6 @@
     <script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script>
     <script type="text/javascript" src="/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
         <script type="text/javascript" src="/include/minify/g=lightboxie6"></script>
-        <script type="text/javascript" src="include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
 {% endblock %}
 
 {% block stylesheet %}
diff --git a/templates/web/lightbox/feed.twig b/templates/web/lightbox/feed.twig
index 49dc3176bf..be7c48523e 100644
--- a/templates/web/lightbox/feed.twig
+++ b/templates/web/lightbox/feed.twig
@@ -7,7 +7,6 @@
     <script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script>
     <script type="text/javascript" src="/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
         <script type="text/javascript" src="/include/minify/g=lightbox"></script>
-        <script type="text/javascript" src="/include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
 {% endblock %}
 
 {% block stylesheet %}
diff --git a/templates/web/lightbox/validate.twig b/templates/web/lightbox/validate.twig
index 8912d53c99..38a0613961 100644
--- a/templates/web/lightbox/validate.twig
+++ b/templates/web/lightbox/validate.twig
@@ -7,7 +7,6 @@
     <script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script>
     <script type="text/javascript" src="/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
         <script type="text/javascript" src="/include/minify/g=lightbox"></script>
-        <script type="text/javascript" src="/include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
 {% endblock %}
 
 {% block stylesheet %}
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 8a8236953a..5bfba4f227 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -1026,7 +1026,6 @@
     </script>
     <script type="text/javascript" src="{{registry.get('GV_STATIC_URL')}}/include/minify/g=prod"></script>
     <script type="text/javascript" src="{{registry.get('GV_STATIC_URL')}}/include/jslibs/jquery-ui-1.8.17/js/jquery-ui-1.8.17.custom.min.js"></script>
-    <script type="text/javascript" src="{{registry.get('GV_STATIC_URL')}}/include/minify/f=include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
     <script type="text/javascript">
         $(document).ready(function(){
             p4.reg_delete="{% if user.getPrefs("warning_on_delete_story") %}true{% else %}false{% endif %}";
diff --git a/www/client/index.php b/www/client/index.php
index 507ab7ec48..9d1d61562c 100644
--- a/www/client/index.php
+++ b/www/client/index.php
@@ -53,7 +53,6 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
 
         </style>
         <script type="text/javascript" src="/include/minify/f=include/jslibs/jquery-1.7.1.js"></script>
-        <script type="text/javascript" src="/include/minify/f=include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
         <link rel="stylesheet" type="text/css" href="/include/jslibs/jquery-ui-1.8.17/css/dark-hive/jquery-ui-1.8.17.custom.css" />
         <link type="text/css" rel="stylesheet" href="/include/minify/f=include/jslibs/jquery.contextmenu.css,skins/common/main.css" />
         <?php
diff --git a/www/client/jquery.p4client.1.0.js b/www/client/jquery.p4client.1.0.js
index 80cf90b93d..cff97dc77b 100644
--- a/www/client/jquery.p4client.1.0.js
+++ b/www/client/jquery.p4client.1.0.js
@@ -793,10 +793,6 @@ function evt_dwnl(lst)
 		overlay: {
 			backgroundColor: '#000',
 			opacity: 0.7
-		},
-		beforeclose:function(){
-			tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
-			tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
 		}
 	}).dialog('open');
 
@@ -809,8 +805,6 @@ function evt_dwnl(lst)
 
 		dialog_box.removeClass('loading').empty().append(data);
 		$('.tabs', dialog_box).tabs();
-		tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
-		tinyMCE.execCommand('mceAddControl',true,'order_usage');
 
 		$('.close_button', dialog_box).bind('click',function(){
 			dialog_box.dialog('close').dialog('destroy');
diff --git a/www/prod/page0.js b/www/prod/page0.js
index ee9ad30c96..49b94a62d5 100644
--- a/www/prod/page0.js
+++ b/www/prod/page0.js
@@ -2528,10 +2528,6 @@ function downloadThis(datas)
         overlay: {
             backgroundColor: '#000',
             opacity: 0.7
-        },
-        beforeclose:function(){
-            tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
-            tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
         }
     }).dialog('open');
 
@@ -2539,8 +2535,6 @@ function downloadThis(datas)
 
         dialog_box.removeClass('loading').empty().append(data);
         $('.tabs', dialog_box).tabs();
-        tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
-        tinyMCE.execCommand('mceAddControl',true,'order_usage');
 
         $('.close_button', dialog_box).bind('click',function(){
             dialog_box.dialog('close').dialog('destroy');
diff --git a/www/skins/lightbox/jquery.lightbox.ie6.js b/www/skins/lightbox/jquery.lightbox.ie6.js
index 43c307969a..613f7b4605 100644
--- a/www/skins/lightbox/jquery.lightbox.ie6.js
+++ b/www/skins/lightbox/jquery.lightbox.ie6.js
@@ -490,10 +490,6 @@ function download(value)
 		overlay: {
 			backgroundColor: '#000',
 			opacity: 0.7
-		},
-		beforeclose:function(){
-			tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
-			tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
 		}
 	}).dialog('open');
 
@@ -501,8 +497,6 @@ function download(value)
 
 		dialog_box.removeClass('loading').empty().append(data);
 		$('.tabs', dialog_box).tabs();
-		tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
-		tinyMCE.execCommand('mceAddControl',true,'order_usage');
 
 		$('.close_button', dialog_box).bind('click',function(){
 			dialog_box.dialog('close').dialog('destroy');
diff --git a/www/skins/lightbox/jquery.lightbox.js b/www/skins/lightbox/jquery.lightbox.js
index f12d8dbedf..236aa25b7b 100644
--- a/www/skins/lightbox/jquery.lightbox.js
+++ b/www/skins/lightbox/jquery.lightbox.js
@@ -1089,10 +1089,6 @@ function download(value)
     overlay: {
       backgroundColor: '#000',
       opacity: 0.7
-    },
-    beforeclose:function(){
-      tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
-      tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
     }
   }).dialog('open');
 
@@ -1100,8 +1096,6 @@ function download(value)
 
     dialog_box.removeClass('loading').empty().append(data);
     $('.tabs', dialog_box).tabs();
-    tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
-    tinyMCE.execCommand('mceAddControl',true,'order_usage');
 
     $('.close_button', dialog_box).bind('click',function(){
       dialog_box.dialog('close').dialog('destroy');