From b5da5df1e652133577709c43986c96c7d8842e6c Mon Sep 17 00:00:00 2001 From: nagoon97 Date: Tue, 11 Sep 2012 01:24:50 +0000 Subject: [PATCH] Fixes related to Issue 1253 is merged from the luminous branch git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11200 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/common.js | 15 +++++++++++---- common/js/xe.js | 29 ++++++++++++++++++++++------- common/js/xe.min.js | 2 +- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/common/js/common.js b/common/js/common.js index 99f380524..bb8128aae 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -189,14 +189,21 @@ jQuery(function($) { $(this).hide().prev('button').show().parent().next(fold_container).hide(); }); } - + jQuery('input[type="submit"]').click(function(ev){ - jQuery(ev.currentTarget).attr('disabled', 'disabled'); - setTimeout(function($el){ + var $el = jQuery(ev.currentTarget); + + setTimeout(function(){ + return function(){ + $el.attr('disabled', 'disabled'); + }; + }(), 0); + + setTimeout(function(){ return function(){ $el.removeAttr('disabled'); }; - }(jQuery(ev.currentTarget)), 3000); + }(), 3000); }); }); diff --git a/common/js/xe.js b/common/js/xe.js index 516c5757e..345459888 100644 --- a/common/js/xe.js +++ b/common/js/xe.js @@ -473,7 +473,22 @@ jQuery(function($) { $(this).hide().prev('button').show().parent().next(fold_container).hide(); }); } - + + jQuery('input[type="submit"]').click(function(ev){ + var $el = jQuery(ev.currentTarget); + + setTimeout(function(){ + return function(){ + $el.attr('disabled', 'disabled'); + }; + }(), 0); + + setTimeout(function(){ + return function(){ + $el.removeAttr('disabled'); + }; + }(), 3000); + }); }); (function(){ // String extension methods @@ -633,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; diff --git a/common/js/xe.min.js b/common/js/xe.min.js index 68b8088f7..f6b3a423f 100644 --- a/common/js/xe.min.js +++ b/common/js/xe.min.js @@ -14,7 +14,7 @@ arguments[0],a.extend(c,arguments[1]||{})}!0==c.doClick&&(c.checked=null);"strin if("undefined"==typeof g.length||1>g.length)g=Array(g);if(g.length)for(var j=0;j"+l+" "}}this.loaded_popup_menus[c]=b}b&&(c=a("#popup_menu_area").html(""),b=e.page_y,e=e.page_x, c.outerHeight()+b>a(window).height()+a(window).scrollTop()&&(b=a(window).height()-c.outerHeight()+a(window).scrollTop()),c.outerWidth()+e>a(window).width()+a(window).scrollLeft()&&(e=a(window).width()-c.outerWidth()+a(window).scrollLeft()),c.css({top:b,left:e}).show())}}})(jQuery); jQuery(function(a){a.browser.msie&&a("select").each(function(a,b){for(var g=!1,d=[],i=0;i