Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for exportConfigVars.

Browse Source
This commit is contained in:
wangyidong
2014-08-25 07:18:20 +00:00
parent 1d197648db
commit 084182698d
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.php
View File

@@ -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'] = '简体';

11
lib/front/front.class.php
View File

@@ -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;
}

1
module/common/view/form.html.php
View File

@@ -1,5 +1,4 @@
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
<?php js::set('ajaxTimeout', $this->config->timeout)?>
<?php
js::import($jsRoot . 'jquery/form/min.js');
js::import($jsRoot . 'jquery/form/zentao.js');

4
www/js/jquery/form/zentao.js vendored
View File

@@ -6,7 +6,7 @@ $.extend(
var options =
{
target : null,
timeout : ajaxTimeout,
timeout : config.timeout,
dataType:'json',
success:function(response)
@@ -85,7 +85,7 @@ $.extend(
error:function(jqXHR, textStatus, errorThrown)
{
$.enableForm(formID);
if(textStatus == 'timeout' || textStatus == 'error') return alert(config.timeout);
if(textStatus == 'timeout' || textStatus == 'error') return alert(lang.timeout);
alert(jqXHR.responseText + textStatus + errorThrown);
}
};

2
www/js/m.my.full.js
View File

@@ -107,7 +107,7 @@ function setForm()
{
submitLabel = $(submitObj).attr('value');
$(submitObj).attr('disabled', 'disabled');
$(submitObj).attr('value', config.submitting);
$(submitObj).attr('value', lang.submitting);
$(submitObj).addClass('button-d');
formClicked = true;
}

4
www/js/my.full.js
View File

@@ -436,12 +436,12 @@ function setForm()
$('form').submit(function()
{
submitObj = $(this).find(':submit');
if($(submitObj).size() == 1)
if($(submitObj).size() >= 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;