不在 XMLHttpRequest 中载入脚本避免 Chrome 浏览器载入边栏操作过程中锁死

fengkaijia · Sep 22, 2017 · 51d07d3 · 51d07d3
1 parent 5e1f4d1
commit 51d07d3
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 28 deletions.
diff --git a/application/views/admin/admission/accept_waitlist.php b/application/views/admin/admission/accept_waitlist.php
@@ -28,10 +28,7 @@
 		$subtext_title[$one['id']] = $one['title'];
 	}
 }
-?><link href="<?php echo static_url(is_dev() ? 'static/css/bootstrap.select.css' : 'static/css/bootstrap.select.min.css');?>" rel="stylesheet">
-<script src="<?php echo static_url(is_dev() ? 'static/js/bootstrap.select.js' : 'static/js/bootstrap.select.min.js');?>"></script>
-<script src="<?php echo static_url(is_dev() ? 'static/js/locales/bootstrap.select.locale.js' : 'static/js/locales/bootstrap.select.locale.min.js');?>"></script>
-<script>
+?><script>
 	$('.selectpicker').selectpicker();
 </script>
 

diff --git a/application/views/admin/admission/arrange_interview.php b/application/views/admin/admission/arrange_interview.php
@@ -28,10 +28,7 @@
 			$retest_last = $link_text;
 	}
 }
-?><link href="<?php echo static_url(is_dev() ? 'static/css/bootstrap.datetimepicker.css' : 'static/css/bootstrap.datetimepicker.min.css');?>" rel="stylesheet">
-<script src="<?php echo static_url(is_dev() ? 'static/js/bootstrap.datetimepicker.js' : 'static/js/bootstrap.datetimepicker.min.js');?>"></script>
-<script src="<?php echo static_url(is_dev() ? 'static/js/locales/bootstrap.datetimepicker.locale.js' : 'static/js/locales/bootstrap.datetimepicker.locale.min.js');?>"></script>
-<script>
+?><script>
 	$('.form_datetime').datetimepicker({
 		language:  'zh-CN',
 		format: "yyyy-mm-dd hh:ii",

diff --git a/application/views/admin/admission/assign_interview.php b/application/views/admin/admission/assign_interview.php
@@ -76,10 +76,7 @@
 	if(!isset($retest_current))
 		$retest_current = $retest_last;
 }
-?><link href="<?php echo static_url(is_dev() ? 'static/css/bootstrap.select.css' : 'static/css/bootstrap.select.min.css');?>" rel="stylesheet">
-<script src="<?php echo static_url(is_dev() ? 'static/js/bootstrap.select.js' : 'static/js/bootstrap.select.min.js');?>"></script>
-<script src="<?php echo static_url(is_dev() ? 'static/js/locales/bootstrap.select.locale.js' : 'static/js/locales/bootstrap.select.locale.min.js');?>"></script>
-<script>
+?><script>
 	$('.selectpicker').selectpicker();
 
 	jQuery(function($){

diff --git a/application/views/admin/admission/assign_seat.php b/application/views/admin/admission/assign_seat.php
@@ -9,10 +9,7 @@
  * @package iPlacard
  * @since 2.0
  */
-?><link href="<?php echo static_url(is_dev() ? 'static/css/bootstrap.select.css' : 'static/css/bootstrap.select.min.css');?>" rel="stylesheet">
-<script src="<?php echo static_url(is_dev() ? 'static/js/bootstrap.select.js' : 'static/js/bootstrap.select.min.js');?>"></script>
-<script src="<?php echo static_url(is_dev() ? 'static/js/locales/bootstrap.select.locale.js' : 'static/js/locales/bootstrap.select.locale.min.js');?>"></script>
-<script>
+?><script>
 	$('.selectpicker').selectpicker({
 		iconBase: 'fa',
 		tickIcon: 'fa-check'

diff --git a/application/views/admin/admission/do_interview.php b/application/views/admin/admission/do_interview.php
@@ -15,10 +15,7 @@
 {
 	$hiddens["score_$sid"] = 0;
 }
-
-if(option('interview_save_enabled', false)) { ?><script src="<?php echo static_url(is_dev() ? 'static/js/jquery.cookie.js' : 'static/js/jquery.cookie.min.js');?>"></script>
-<script src="<?php echo static_url(is_dev() ? 'static/js/jquery.sayt.js' : 'static/js/jquery.sayt.min.js');?>"></script><?php } ?>
-<script>
+?><script>
 	var scored = false;
 
 	jQuery(function($){

diff --git a/application/views/admin/admission/recover_account.php b/application/views/admin/admission/recover_account.php
@@ -9,8 +9,7 @@
  * @package iPlacard
  * @since 2.0
  */
-?><script src="<?php echo static_url(is_dev() ? 'static/js/jquery.countdown.js' : 'static/js/jquery.countdown.min.js');?>"></script>
-<script>
+?><script>
 	$('#clock_delete').countdown(<?php echo $delete_time;?> * 1000, function(event) {
 		$(this).html(event.strftime('%-D 天 %H:%M:%S'));
 	});

diff --git a/application/views/admin/delegate_note.php b/application/views/admin/delegate_note.php
@@ -9,12 +9,7 @@
  * @package iPlacard
  * @since 2.0
  */
-?><link href="<?php echo static_url(is_dev() ? 'static/css/jquery.atwho.css' : 'static/css/jquery.atwho.min.css');?>" rel="stylesheet">
-<script src="<?php echo static_url(is_dev() ? 'static/js/jquery.cookie.js' : 'static/js/jquery.cookie.min.js');?>"></script>
-<script src="<?php echo static_url(is_dev() ? 'static/js/jquery.sayt.js' : 'static/js/jquery.sayt.min.js');?>"></script>
-<script src="<?php echo static_url(is_dev() ? 'static/js/jquery.caret.js' : 'static/js/jquery.caret.min.js');?>"></script>
-<script src="<?php echo static_url(is_dev() ? 'static/js/jquery.atwho.js' : 'static/js/jquery.atwho.min.js');?>"></script>
-<script>
+?><script>
 	$('#add_note_<?php echo $uid;?> #note').atwho({
 		at: "@",
 		data: "<?php echo base_url('user/ajax/mention');?>",

diff --git a/application/views/admin/delegate_profile.php b/application/views/admin/delegate_profile.php
@@ -10,6 +10,7 @@
  * @since 2.0
  */
 
+//TODO: 在HTML底部载入JS文件
 $this->ui->html('header', '<link href="'.static_url(is_dev() ? 'static/css/bootstrap.datatables.css' : 'static/css/bootstrap.datatables.min.css').'" rel="stylesheet">');
 $this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/jquery.datatables.js' : 'static/js/jquery.datatables.min.js').'"></script>');
 $this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/locales/jquery.datatables.locale.js' : 'static/js/locales/jquery.datatables.locale.min.js').'"></script>');
@@ -18,8 +19,24 @@
 $this->ui->html('header', '<link href="'.static_url(is_dev() ? 'static/css/bootstrap.select.css' : 'static/css/bootstrap.select.min.css').'" rel="stylesheet">');
 $this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/bootstrap.select.js' : 'static/js/bootstrap.select.min.js').'"></script>');
 $this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/locales/bootstrap.select.locale.js' : 'static/js/locales/bootstrap.select.locale.min.js').'"></script>');
+$this->ui->html('header', '<link href="'.static_url(is_dev() ? 'static/css/jquery.atwho.css' : 'static/css/jquery.atwho.min.css').'" rel="stylesheet">');
+$this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/jquery.cookie.js' : 'static/js/jquery.cookie.min.js').'"></script>');
+$this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/jquery.sayt.js' : 'static/js/jquery.sayt.min.js').'"></script>');
+$this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/jquery.caret.js' : 'static/js/jquery.caret.min.js').'"></script>');
+$this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/jquery.atwho.js' : 'static/js/jquery.atwho.min.js').'"></script>');
 $this->ui->html('header', '<link href="'.static_url(is_dev() ? 'static/css/flags.css' : 'static/css/flags.min.css').'" rel="stylesheet">');
 
+if($profile['status'] == 'interview_assigned')
+{
+	$this->ui->html('header', '<link href="'.static_url(is_dev() ? 'static/css/bootstrap.datetimepicker.css' : 'static/css/bootstrap.datetimepicker.min.css').'" rel="stylesheet">');
+	$this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/bootstrap.datetimepicker.js' : 'static/js/bootstrap.datetimepicker.min.js').'"></script>');
+	$this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/locales/bootstrap.datetimepicker.locale.js' : 'static/js/locales/bootstrap.datetimepicker.locale.min.js').'"></script>');
+}
+elseif($profile['status'] == 'deleted')
+{
+	$this->ui->html('header', '<script src="'.static_url(is_dev() ? 'static/js/jquery.countdown.js' : 'static/js/jquery.countdown.min.js').'"></script>');
+}
+
 if($profile_editable)
 {
 	$this->ui->html('header', '<link href="'.static_url(is_dev() ? 'static/css/bootstrap.editable.css' : 'static/css/bootstrap.editable.min.css').'" rel="stylesheet">');