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

Fix #238 installer freezing in Chrome

Browse source
This commit is contained in:
Kijin Sung 2016-02-09 09:44:19 +09:00
parent a499aa0d1f
commit f038091b37
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/install/lang/en.php
View file

@ -82,6 +82,7 @@ $lang->ssl_options['optional'] = 'Optional';
$lang->ssl_options['always'] = 'Always';
$lang->about_database_file = 'Sqlite saves data in a file. Location of the database file should be unreachable by web<br/><span style="color:red">Data file should be inside the permission of 777.</span>';
$lang->success_installed = 'Installation has been completed.';
$lang->msg_db_checking = 'Checking...';
$lang->msg_installing = 'Installing...';
$lang->msg_cannot_proc = 'Installation environment is not proper to proceed.';
$lang->msg_already_installed = 'Rhymix is already installed.';

1
modules/install/lang/ko.php
View file

@ -83,6 +83,7 @@ $lang->ssl_options['always'] = '항상 사용';
$lang->about_database_file = 'Sqlite는 파일에 데이터를 저장합니다. 데이터베이스 파일의 위치를 웹에서 접근할 수 없는 곳으로 해야 합니다.<br/><span style="color:red">데이터 파일은 777퍼미션 설정된 곳으로 지정해주세요.</span>';
$lang->success_installed = '설치가 되었습니다.';
$lang->msg_cannot_proc = '설치 환경이 갖춰지지 않아 요청을 실행할 수가 없습니다.';
$lang->msg_db_checking = '확인 중입니다...';
$lang->msg_installing = '설치 중입니다...';
$lang->msg_already_installed = '이미 설치가 되어 있습니다.';
$lang->msg_dbconnect_failed = 'DB접속 오류가 발생하였습니다. DB정보를 다시 확인해주세요.';

2
modules/install/tpl/db_config.html
View file

@ -59,7 +59,7 @@
<a href="{getUrl('', 'act','dispInstallCheckEnv')}" class="button grey">&laquo; {$lang->cmd_back}</a>
</div>
<div class="align-right">
<button type="submit" id="task-db-select" value="">{$lang->cmd_next} &raquo;</button>
<button type="submit" id="task-db-select" value="" data-checking="{$lang->msg_db_checking}">{$lang->cmd_next} &raquo;</button>
</div>
</div>
</form>

17
modules/install/tpl/js/install.js
View file

@ -37,11 +37,20 @@ jQuery(function($){
}
});
}
if($("#task-db-select").size()) {
$("#task-db-select").parents("form").on("submit", function() {
setTimeout(function() {
$("#task-db-select").text($("#task-db-select").data("checking"));
$("#task-db-select").prop("disabled", true);
}, 100);
});
}
if($("#task-complete-install").size()) {
$("#task-complete-install").click(function() {
$("#task-complete-install").text($("#task-complete-install").data("installing"));
$("#task-complete-install").prop("disabled", true);
$(window).on("beforeunload", function() { return ""; });
$("#task-complete-install").parents("form").on("submit", function() {
setTimeout(function() {
$("#task-complete-install").text($("#task-complete-install").data("installing"));
$("#task-complete-install").prop("disabled", true);
}, 100);
});
}
});