merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -81,10 +81,10 @@
var border = parseInt($form.find('#image_border').val(), 10);
var margin = parseInt($form.find('#image_margin').val(), 10);
if($form.find('#align_normal').attr('checked') == true) align = '';
else if($form.find('#align_left').attr('checked') == true) align = 'left';
else if($form.find('#align_middle').attr('checked') == true) align = 'middle';
else if($form.find('#align_right').attr('checked') == true) align = 'right';
if($form.find('#align_normal').attr('checked') == 'checked') align = '';
else if($form.find('#align_left').attr('checked') == 'checked') align = 'left';
else if($form.find('#align_middle').attr('checked') == 'checked') align = 'middle';
else if($form.find('#align_right').attr('checked') == 'checked') align = 'right';
var width = $form.find('#width').val();
var height = $form.find('#height').val();