hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1059 : Remove tinyMCE as dependency

Browse Source
This commit is contained in:
Romain Neutron
2013-01-08 19:17:12 +01:00
parent 3a45a1f951
commit a0dda3ebe7
11 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/common/dialog_export.twig
View File

@@ -184,7 +184,7 @@
</div> </div>
<div> <div>
<p>{% trans 'export::mail: contenu du mail' %}</p> <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>
<div> <div>
<p>{% trans 'export::mail: fichiers joint' %}</p> <p>{% trans 'export::mail: fichiers joint' %}</p>
@@ -261,7 +261,7 @@
{% trans 'commande::utilisation prevue' %} {% trans 'commande::utilisation prevue' %}
</td> </td>
<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> </td>
</tr> </tr>
<tr> <tr>
@@ -676,7 +676,7 @@
return false; 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); var $this = $(this);
$this.attr('disabled','disabled'); $this.attr('disabled','disabled');

1
templates/web/lightbox/IE6/feed.twig
View File

@@ -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-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/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/minify/g=lightboxie6"></script>
<script type="text/javascript" src="include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
{% endblock %} {% endblock %}
{% block stylesheet %} {% block stylesheet %}

1
templates/web/lightbox/IE6/validate.twig
View File

@@ -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-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/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/minify/g=lightboxie6"></script>
<script type="text/javascript" src="include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
{% endblock %} {% endblock %}
{% block stylesheet %} {% block stylesheet %}

1
templates/web/lightbox/feed.twig
View File

@@ -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-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/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/minify/g=lightbox"></script>
<script type="text/javascript" src="/include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
{% endblock %} {% endblock %}
{% block stylesheet %} {% block stylesheet %}

1
templates/web/lightbox/validate.twig
View File

@@ -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-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/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/minify/g=lightbox"></script>
<script type="text/javascript" src="/include/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
{% endblock %} {% endblock %}
{% block stylesheet %} {% block stylesheet %}

1
templates/web/prod/index.html.twig
View File

@@ -1026,7 +1026,6 @@
</script> </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/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/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"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
p4.reg_delete="{% if user.getPrefs("warning_on_delete_story") %}true{% else %}false{% endif %}"; p4.reg_delete="{% if user.getPrefs("warning_on_delete_story") %}true{% else %}false{% endif %}";

1
www/client/index.php
View File

@@ -53,7 +53,6 @@ $user = User_Adapter::getInstance($usr_id, $appbox);
</style> </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/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 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" /> <link type="text/css" rel="stylesheet" href="/include/minify/f=include/jslibs/jquery.contextmenu.css,skins/common/main.css" />
<?php <?php

6
www/client/jquery.p4client.1.0.js
View File

@@ -793,10 +793,6 @@ function evt_dwnl(lst)
overlay: { overlay: {
backgroundColor: '#000', backgroundColor: '#000',
opacity: 0.7 opacity: 0.7
},
beforeclose:function(){
tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
} }
}).dialog('open'); }).dialog('open');
@@ -809,8 +805,6 @@ function evt_dwnl(lst)
dialog_box.removeClass('loading').empty().append(data); dialog_box.removeClass('loading').empty().append(data);
$('.tabs', dialog_box).tabs(); $('.tabs', dialog_box).tabs();
tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
tinyMCE.execCommand('mceAddControl',true,'order_usage');
$('.close_button', dialog_box).bind('click',function(){ $('.close_button', dialog_box).bind('click',function(){
dialog_box.dialog('close').dialog('destroy'); dialog_box.dialog('close').dialog('destroy');

6
www/prod/page0.js
View File

@@ -2528,10 +2528,6 @@ function downloadThis(datas)
overlay: { overlay: {
backgroundColor: '#000', backgroundColor: '#000',
opacity: 0.7 opacity: 0.7
},
beforeclose:function(){
tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
} }
}).dialog('open'); }).dialog('open');
@@ -2539,8 +2535,6 @@ function downloadThis(datas)
dialog_box.removeClass('loading').empty().append(data); dialog_box.removeClass('loading').empty().append(data);
$('.tabs', dialog_box).tabs(); $('.tabs', dialog_box).tabs();
tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
tinyMCE.execCommand('mceAddControl',true,'order_usage');
$('.close_button', dialog_box).bind('click',function(){ $('.close_button', dialog_box).bind('click',function(){
dialog_box.dialog('close').dialog('destroy'); dialog_box.dialog('close').dialog('destroy');

6
www/skins/lightbox/jquery.lightbox.ie6.js
View File

@@ -490,10 +490,6 @@ function download(value)
overlay: { overlay: {
backgroundColor: '#000', backgroundColor: '#000',
opacity: 0.7 opacity: 0.7
},
beforeclose:function(){
tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
} }
}).dialog('open'); }).dialog('open');
@@ -501,8 +497,6 @@ function download(value)
dialog_box.removeClass('loading').empty().append(data); dialog_box.removeClass('loading').empty().append(data);
$('.tabs', dialog_box).tabs(); $('.tabs', dialog_box).tabs();
tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
tinyMCE.execCommand('mceAddControl',true,'order_usage');
$('.close_button', dialog_box).bind('click',function(){ $('.close_button', dialog_box).bind('click',function(){
dialog_box.dialog('close').dialog('destroy'); dialog_box.dialog('close').dialog('destroy');

6
www/skins/lightbox/jquery.lightbox.js
View File

@@ -1089,10 +1089,6 @@ function download(value)
overlay: { overlay: {
backgroundColor: '#000', backgroundColor: '#000',
opacity: 0.7 opacity: 0.7
},
beforeclose:function(){
tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
} }
}).dialog('open'); }).dialog('open');
@@ -1100,8 +1096,6 @@ function download(value)
dialog_box.removeClass('loading').empty().append(data); dialog_box.removeClass('loading').empty().append(data);
$('.tabs', dialog_box).tabs(); $('.tabs', dialog_box).tabs();
tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
tinyMCE.execCommand('mceAddControl',true,'order_usage');
$('.close_button', dialog_box).bind('click',function(){ $('.close_button', dialog_box).bind('click',function(){
dialog_box.dialog('close').dialog('destroy'); dialog_box.dialog('close').dialog('destroy');