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

@ -71,7 +71,7 @@ function start(cfg) {
// Button settings
button_window_mode : 'transparent',
button_placeholder : $span.get(0),
button_placeholder_id : $span.attr('id'),
button_text : null,
button_image_url : request_uri+'common/img/blank.gif',
button_width : width,