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

merge from 1.5.3.2 (~r11225)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions
Download patch file Download diff file Expand all files Collapse all files

31
common/js/xe.js
View file

@ -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;
@ -1706,7 +1721,7 @@ var Validator = xe.createApp('Validator', {
init : function() {
// {{{ add filters
// email
var regEmail = /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/;
var regEmail = /^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/;
this.cast('ADD_RULE', ['email', regEmail]);
this.cast('ADD_RULE', ['email_address', regEmail]);