merge from 1.5.2.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10466 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-03-23 05:49:16 +00:00
parent c727926d9e
commit 9bf08cf3df
26 changed files with 110 additions and 97 deletions

View file

@ -32,7 +32,7 @@
.xpress-editor a.skip:hover,
.xpress-editor a.skip:active,
.xpress-editor a.skip:focus{position:relative;display:block;padding:5px;right:0;z-index:60;width:auto;height:auto;text-align:right;white-space:nowrap;color:#000;text-decoration:none;letter-spacing:-1px;_zoom:1}
.xpress-editor .input_area{position:relative;margin:10px;z-index:30;*zoom:1;height:400px}
.xpress-editor .input_area{position:relative;margin:10px;z-index:30;*zoom:1;height:400px;overflow:hidden}
.xpress-editor .input_area iframe,
.xpress-editor .input_area textarea{display:block;width:100% !important;position:relative;height:100%;border:0 !important;padding:0 !important;overflow:auto}
.xpress-editor .input_area textarea{*margin:0 -10px;_margin-bottom:-2px}

View file

@ -5813,18 +5813,21 @@ xe.XE_Table = $.Class({
}
}).extend(xe.XE_Table);
})(jQuery);
// Auto Resize Checkbox Toggle Class
$('.input_auto>input').change(function(){
setTimeout(function(){
if($('.input_control').is(':hidden')){
$('.input_auto').addClass('line');
} else {
$('.input_auto').removeClass('line');
}
},1);
jQuery(function($){
$('.input_auto>input').change(function(){
setTimeout(function(){
if($('.input_control').is(':hidden')){
$('.input_auto').addClass('line');
} else {
$('.input_auto').removeClass('line');
}
},1);
});
});
})(jQuery);
if (!window.xe) xe = {};
xe.Editors = [];