diff --git a/config/config.php b/config/config.php index f89e70fa5c..a08c844d4a 100644 --- a/config/config.php +++ b/config/config.php @@ -36,10 +36,10 @@ $config->sessionVar = 'sid'; // requestType=GET: the session var na /* Supported views. */ $config->views = ',html,json,mhtml,'; -/* Set the wide window size. */ +/* Set the wide window size and timeout(ms) and duplicate interval time(min). */ $config->wideSize = 1400; $config->timeout = 30000; -$config->duplicateTime = 60; // from 1 minute. +$config->duplicateTime = 1; // from 1 minute. /* Supported languages. */ $config->langs['zh-cn'] = '简体'; diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 510da7ba0d..1bee40ddc5 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -859,13 +859,16 @@ EOT; $jsConfig->currentMethod = $methodName; $jsConfig->clientLang = $clientLang; $jsConfig->requiredFields = $requiredFields; - $jsConfig->submitting = $lang->submitting; - $jsConfig->save = $lang->save; $jsConfig->router = $app->server->PHP_SELF; - $jsConfig->timeout = $lang->timeout; + $jsConfig->timeout = $config->timeout; + + $jsLang->submitting = $lang->submitting; + $jsLang->save = $lang->save; + $jsLang->timeout = $lang->timeout; $js = self::start(false); - $js .= 'var config=' . json_encode($jsConfig); + $js .= 'var config=' . json_encode($jsConfig) . ";\n"; + $js .= 'var lang=' . json_encode($jsLang) . ";\n"; $js .= self::end(); echo $js; } diff --git a/module/common/view/form.html.php b/module/common/view/form.html.php index 2b7431f757..900ff7f7c5 100755 --- a/module/common/view/form.html.php +++ b/module/common/view/form.html.php @@ -1,5 +1,4 @@ getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> -config->timeout)?> = 1) { var isBtn = submitObj.prop('tagName') == "BUTTON"; submitLabel = isBtn ? $(submitObj).text() : $(submitObj).attr('value'); $(submitObj).attr('disabled', 'disabled'); - var submitting = submitObj.attr('data-submitting') || config.submitting; + var submitting = submitObj.attr('data-submitting') || lang.submitting; if(isBtn) submitObj.text(submitting); else $(submitObj).attr('value', submitting); formClicked = true;