fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-19 19:29:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.7.3.5(r13153:r13167)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/widget/tpl/js/generate_code.js
View file

@ -41,12 +41,12 @@ function doDisplaySkinColorset(colorset)
function doHideSkinColorset()
{
jQuery('select[name=colorset]').parents('li').hide();
jQuery('select[name=colorset]').closest('.x_control-group').hide();
}
function doShowSkinColorset()
{
jQuery('select[name=colorset]').parents('li').show();
jQuery('select[name=colorset]').closest('.x_control-group').show();
}
function completeGenerateCodeInPage(widget_code) {
@ -219,7 +219,7 @@ jQuery(document).ready(function($){
if(src instanceof Object ) {
for(var i=0;i<src.length;i++){
if(src[i].id) {
htmlCode += '<img src="'+src[i].id+'" alt="" style="border: 1px solid #ccc; padding: 5px; max-height: 200px; max-width: 200px;"><button class="filebox_del text" type="button">'+xe.lang.cmd_delete+'</button>';
htmlCode += '<img src="'+src[i].id+'" alt="" style="border:1px solid #ccc;padding:5px;max-height:200px;max-width:200px"> <button type="button" class="filebox_del x_icon-remove">'+xe.lang.cmd_delete+'</button> ';
if(i==0) $(this).siblings('input').val(src[i].id);
else {
var aux = $(this).siblings('input').val();
@ -228,7 +228,7 @@ jQuery(document).ready(function($){
}
else {
if(src[i]){
htmlCode += '<img src="'+src[i]+'" alt="" style="border: 1px solid #ccc; padding: 5px; max-height: 200px; max-width: 200px;"><button class="filebox_del text" type="button">'+xe.lang.cmd_delete+'</button>';
htmlCode += '<img src="'+src[i]+'" alt="" style="border:1px solid #ccc;padding:5px;max-height:200px;max-width:200px"> <button type="button" class="filebox_del x_icon-remove">'+xe.lang.cmd_delete+'</button> ';
if(i==0) $(this).siblings('input').val(src[i]);
else {
var aux = $(this).siblings('input').val();
@ -238,7 +238,7 @@ jQuery(document).ready(function($){
}
}
} else {
htmlCode = '<img src="'+src+'" alt="" style="border: 1px solid #ccc; padding: 5px; max-height: 200px; max-width: 200px;"> <button class="filebox_del text" type="button">'+xe.lang.cmd_delete+'</button>';
htmlCode = '<img src="'+src+'" alt="" style="border: 1px solid #ccc; padding: 5px; max-height: 200px; max-width: 200px;"> <button class="filebox_del x_btn x_btn-danger" type="button">'+xe.lang.cmd_delete+'</button> ';
$(this).siblings('input').val(src);
}
$(this).before(htmlCode);