Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/games_controller.rb

@@ -431,7 +431,6 @@ class GamesController < ApplicationController
   # params[:status] 1: 目录树点击的请求 0：正常自动加载
   # 返回参数status ： -1 系统统一报错提示；-3 需要轮训重试，带retry参数；-4 立即重试
   def rep_content
-    raise("666")
     challenge_path = @game.challenge.try(:path)
     if challenge_path.blank?
       tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")

public/editormd/plugins/image-dialog/image-dialog.js

@@ -113,13 +113,13 @@
                             }
 
                             this.hide().lockScreen(false).hideMask();
-
+                            cm.focus && cm.focus()
                             return false;
                         }],
 
                         cancel : [lang.buttons.cancel, function() {
                             this.hide().lockScreen(false).hideMask();
-
+                            cm.focus && cm.focus()
                             return false;
                         }]
                     }