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

Fix #858 allow negative margins for widget

Browse source
This commit is contained in:
Kijin Sung 2017-06-28 15:56:02 +09:00
parent e4d4b42869
commit a9dba51f79
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/widget/tpl/js/widget.js
View file

@ -706,12 +706,12 @@ jQuery(function($){
});
});
function _getSize(value) {
function _getSize(value, allow_negative) {
if(!value) return 0;
var type = "px";
if(value.lastIndexOf("%")>=0) type = "%";
var num = parseInt(value,10);
if(num<1) return 0;
if(num<1 && !allow_negative) return 0;
if(type == "%" && num > 100) num = 100;
return ""+num+type;
}
@ -768,10 +768,10 @@ function doApplyWidgetSize(fo_obj) {
selectedSizeWidget.style.borderLeft = _getBorderStyle(fo_obj.border_left_color, fo_obj.border_left_thick, fo_obj.border_left_type);
selectedSizeWidget.style.borderRight = _getBorderStyle(fo_obj.border_right_color, fo_obj.border_right_thick, fo_obj.border_right_type);
selectedSizeWidget.style.marginTop = _getSize(fo_obj.margin_top.value);
selectedSizeWidget.style.marginRight = _getSize(fo_obj.margin_right.value);
selectedSizeWidget.style.marginBottom = _getSize(fo_obj.margin_bottom.value);
selectedSizeWidget.style.marginLeft = _getSize(fo_obj.margin_left.value);
selectedSizeWidget.style.marginTop = _getSize(fo_obj.margin_top.value, true);
selectedSizeWidget.style.marginRight = _getSize(fo_obj.margin_right.value, true);
selectedSizeWidget.style.marginBottom = _getSize(fo_obj.margin_bottom.value, true);
selectedSizeWidget.style.marginLeft = _getSize(fo_obj.margin_left.value, true);
if(!fo_obj.background_color.value || fo_obj.background_color.value == '#' || fo_obj.background_color.value == 'transparent') selectedSizeWidget.style.backgroundColor = 'transparent';
else selectedSizeWidget.style.backgroundColor = _getBGColorStyle(fo_obj.background_color.value);