merge from 1.5.3.2(r11162 ~ r11201)

and from luminous (r11141 ~ r11193)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11202 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-09-11 02:52:49 +00:00
parent 773a666d12
commit 42eb19ae10
32 changed files with 340 additions and 131 deletions

View file

@ -648,18 +648,18 @@ function sendMailTo(to) {
/**
* @brief url이동 (open_window 값이 N 아니면 새창으로 띄움)
**/
function move_url(url, open_wnidow) {
function move_url(url, open_window) {
if(!url) return false;
if(typeof(open_wnidow) == 'undefined') open_wnidow = 'N';
if(open_wnidow=='N') {
open_wnidow = false;
if(typeof(open_window) == 'undefined') open_window = 'N';
if(open_window=='N') {
open_window = false;
} else {
open_wnidow = true;
open_window = true;
}
if(/^\./.test(url)) url = request_uri+url;
if(open_wnidow) {
if(open_window) {
winopen(url);
} else {
location.href=url;