From 0d0a2499a968d23040430da83b315f3ae71fa3d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 22 Aug 2019 17:36:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/tpm/TPMIndexHOC.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 6149687bc..2d6bedf18 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
// $('head').append($('')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('')
- .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1`));
+ .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`));
$('head').append($('')
- .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1`));
+ .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`));
// index.html有加载
$('head').append($('')
- .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1`));
+ .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`));
// $('head').append($('')
From 6688b35d58579975955abf9f97365646a31f9a47 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 22 Aug 2019 17:37:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E7=9B=B4?=
=?UTF-8?q?=E6=8E=A5=E8=BF=94=E5=9B=9Econtent=20true=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/page/MainContentContainer.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/page/MainContentContainer.js b/public/react/src/modules/page/MainContentContainer.js
index 33257703d..3214fe5d5 100644
--- a/public/react/src/modules/page/MainContentContainer.js
+++ b/public/react/src/modules/page/MainContentContainer.js
@@ -357,7 +357,9 @@ class MainContentContainer extends Component {
this.fetchRepositoryCode(props, null, null, true)
} else{
this.setState({ isEditablePath, currentPath: path });
- this.oldRepositoryCode = fetchRepositoryCodeResponse.data.content || '';
+ this.oldRepositoryCode = ((fetchRepositoryCodeResponse.data.content === true || !fetchRepositoryCodeResponse.data.content)
+ ? '' : fetchRepositoryCodeResponse.data.content);
+
this.updateRepositoryCode(this.oldRepositoryCode, updateCodeMirror)
}