fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 04:24:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 910: Hide material writer if the material module isn't exists

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9920 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-12-08 06:26:44 +00:00
parent 58315df742
commit 77d1efccba
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/editor/skins/dreditor/editor.html
View file

@ -20,7 +20,7 @@
<!--@end--> <!--@end-->
{@$cookie_tool=explode(',', $_COOKIE['DrEditorToolbar'])} {@$cookie_tool=explode(',', $_COOKIE['DrEditorToolbar'])}
{@$default_tool=explode(',', 'hx,txt,material,link,list,quote,img,movie,file,hr,index')} {@$default_tool=explode(',', 'hx,txt,'.($material_exists?'material,':'').'link,list,quote,img,movie,file,hr,index');}
{@$external_components=array_keys($drComponentList)} {@$external_components=array_keys($drComponentList)}
{@$enable_tool=array_unique(array_merge($cookie_tool, $default_tool, (array)$external_components))} {@$enable_tool=array_unique(array_merge($cookie_tool, $default_tool, (array)$external_components))}
@ -479,7 +479,7 @@
</fieldset> </fieldset>
</div> </div>
<div class="wArea mArea material"> <div class="wArea mArea material" cond="$material_exists">
<!-- class="mArea" | class="mArea open" --> <!-- class="mArea" | class="mArea open" -->
<fieldset> <fieldset>
<legend>{$lang->edit->materials}</legend> <legend>{$lang->edit->materials}</legend>

2
modules/editor/skins/dreditor/js/DrEditor.js
View file

@ -1238,7 +1238,7 @@ var ImageWriter = xe.createPlugin('ImageWriter', {
var callback_id = ''+(new Date).getTime()+Math.ceil(Math.random()*1000); var callback_id = ''+(new Date).getTime()+Math.ceil(Math.random()*1000);
window[callback_id] = function(fileObj){ self.onfileuploaded(seq, callback_id, fileObj); } window[callback_id] = function(fileObj){ self.onfileuploaded(seq, callback_id, fileObj); }
var filesrl = _image.attr('class').match(/(?:^|\s)xe_filesrl_(\d+)(?:\s|$)/); var filesrl = (_image.attr('class')||'').match(/(?:^|\s)xe_filesrl_(\d+)(?:\s|$)/);
filesrl = (filesrl && filesrl[1])? filesrl[1] : ''; filesrl = (filesrl && filesrl[1])? filesrl[1] : '';
// upload file // upload file