Skip to content

Commit 6cf84d5

Browse files
author
春秋一语
authored
Merge pull request #11 from Coding/community
Community
2 parents ea25b95 + f8f8159 commit 6cf84d5

27 files changed

+756
-100
lines changed

‎app/changelog.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ <h1>Cloud Studio 更新日志</h1>
856856
<div class="record">
857857
<div class="record_img_info">
858858
<a href="https://coding.net/index">
859-
<img src="https://dn-coding-net-production-pp.qbox.me/0905c8a9-5b33-4819-83d4-3cd0528b0c86.png" height="36" width="353" style="position: absolute;">
859+
<img src="https://dn-coding-net-production-pp.codehub.cn/0905c8a9-5b33-4819-83d4-3cd0528b0c86.png" height="36" width="353" style="position: absolute;">
860860
</a>
861861
<div class="record_info">
862862
<p>
@@ -881,7 +881,7 @@ <h1>Cloud Studio 更新日志</h1>
881881
</div>
882882
<section class="mobile-record">
883883
<a href="https://coding.net/index">
884-
<img src="https://dn-coding-net-production-pp.qbox.me/0905c8a9-5b33-4819-83d4-3cd0528b0c86.png">
884+
<img src="https://dn-coding-net-production-pp.codehub.cn/0905c8a9-5b33-4819-83d4-3cd0528b0c86.png">
885885
</a>
886886
<div class="record-info-mobile">
887887
<p style="margin-top: 10px">

‎app/commons/Tab/TabLabel.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ import * as Modal from '../../components/Modal/actions'
99
import config from 'config'
1010
import dispatchCommand from 'commands/dispatchCommand'
1111

12-
const closeFileTab = async (e, tab, removeTab) => {
12+
const closeFileTab = async (e, tab, removeTab, activateTab) => {
1313
e.stopPropagation()
1414
if (tab.tabGroupId === 'terminalGroup') {
1515
removeTab(tab.id)
1616
return
1717
}
18+
19+
activateTab(tab.id)
20+
1821
const isMonaco = !config.switchOldEditor
1922
const editor = isMonaco ? tab.editorInfo.monacoEditor : tab.editor.cm
2023
const content = (editor && editor.getValue) ? editor.getValue() : ''
@@ -26,6 +29,7 @@ const closeFileTab = async (e, tab, removeTab) => {
2629
})
2730
if (confirmed) {
2831
Modal.dismissModal()
32+
console.log('ah')
2933
dispatchCommand('file:save')
3034
} else {
3135
Modal.dismissModal()
@@ -65,7 +69,7 @@ let TabLabel = observer(({ tab, removeTab, activateTab, openContextMenu, dbClick
6569
{tab.icon ? <div className={`icon ${tab.icon}`}></div>: null}
6670
<div className='title'>{tab.title}</div>
6771
<div className='control'>
68-
<i className='close' onClick={e => closeFileTab(e, tab, removeTab)}>×</i>
72+
<i className='close' onClick={e => closeFileTab(e, tab, removeTab, activateTab)}>×</i>
6973
<i className='dot'></i>
7074
</div>
7175
</li>

‎app/components/Editor/components/ImageEditor.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
33
import config from 'config'
44
import { request } from 'utils'
55

6-
const previewPic = 'https://dn-coding-net-production-static.qbox.me/static/5d487aa5c207cf1ca5a36524acb953f1.gif';
6+
const previewPic = 'https://coding-net-production-static.codehub.cn/static/5d487aa5c207cf1ca5a36524acb953f1.gif';
77

88
class ImageEditor extends Component {
99
constructor (props) {

‎app/components/Modal/modals/About.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ const Alert = (props) => {
1515
<div className='logo-item'>
1616
<div className='coding-logo'>
1717
<a href='https://coding.net' target='_blank' rel='noopener noreferrer' >
18-
<img src='https://dn-coding-net-production-pp.qbox.me/600bb772-e8ae-462c-966f-fef4637cb2bb.png' alt='Coding Logo' />
18+
<img src='https://dn-coding-net-production-pp.codehub.cn/600bb772-e8ae-462c-966f-fef4637cb2bb.png' alt='Coding Logo' />
1919
</a>
2020
</div>
2121
<div className='info'>出品</div>
2222
</div>
2323
<div className='logo-item'>
2424
<div className='tencent-logo'>
2525
<a href='https://cloud.tencent.com/' target='_blank' rel='noopener noreferrer'>
26-
<img src='https://dn-coding-net-production-pp.qbox.me/ebeeacca-4e0e-4348-ab33-168eb069afcb.png' alt='Tecent Logo' />
26+
<img src='https://dn-coding-net-production-pp.codehub.cn/ebeeacca-4e0e-4348-ab33-168eb069afcb.png' alt='Tecent Logo' />
2727
</a>
2828
</div>
2929
<div className='info'>提供计算支持</div>

‎app/containers/Footer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const Footer = () => (
44
<div id='global_footer'>
55
<div className='record'>
66
<div className='record_img_info'>
7-
<a href='https://coding.net/index'><img src='https://dn-coding-net-production-pp.qbox.me/0905c8a9-5b33-4819-83d4-3cd0528b0c86.png' height='36' width='353' style={{ position: 'absolute' }} /></a>
7+
<a href='https://coding.net/index'><img src='https://dn-coding-net-production-pp.codehub.cn/0905c8a9-5b33-4819-83d4-3cd0528b0c86.png' height='36' width='353' style={{ position: 'absolute' }} /></a>
88
<div className='record_info'>
99
<p>
1010
<a href='https://coding.net/about' target='_blank' rel='noopener noreferrer'>关于我们</a> | <a href='https://coding.net/privacy' target='_blank' rel='noopener noreferrer'>隐私策略</a> | <a href='https://coding.net/terms' target='_blank' rel='noopener noreferrer'>服务条款</a> | <a href='https://coding.net/security' target='_blank' rel='noopener noreferrer'>安全策略</a>

‎app/containers/GlobalPrompt.jsx

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,19 @@ class GlobalPrompt extends Component {
3030
// })
3131

3232
// if (!localStorage.getItem('visited')) {
33-
// promptMessage.push({
34-
// content: (
35-
// <p>
36-
// WebIDE 现已全面升级为 Cloud Studio, 使用旧版 IDE 请点击{' '}
37-
// <a href='https://ide.coding.net' target='_blank' rel='noopener noreferrer'>
38-
// WebIDE
39-
// </a>{' '}
40-
// </p>
41-
// ),
42-
// id: `global-prompt-${id++}`,
43-
// type: 'update'
44-
// })
33+
promptMessage.push({
34+
content: (
35+
<p>
36+
WebIDE 现已在
37+
<a href='https://dev.tencent.com/' target='_blank' rel='noopener noreferrer'>腾讯云开发者平台</a>中全面升级，此版本 <strong>将于 2018 年 11 月 30 日正式停止服务</strong>，详情参见{' '}
38+
<a href='/export' target='_blank' rel='noopener noreferrer'>
39+
这里
40+
</a>{' '}
41+
</p>
42+
),
43+
id: `global-prompt-${id++}`,
44+
type: 'update'
45+
})
4546
// }
4647

4748
if (browserVersion !== 'Chrome' && browserVersion !== 'Safari') {
@@ -69,7 +70,7 @@ class GlobalPrompt extends Component {
6970
// </p>
7071
<p>
7172
{i18n`global.offlineInfo`}
72-
<a href='https://ide.coding.net' rel='noopener noreferrer'>{i18n`global.gotoIDE`}</a>
73+
<a href='https://studio.dev.tencent.com' rel='noopener noreferrer'>{i18n`global.gotoIDE`}</a>
7374
</p>
7475
),
7576
id: `global-prompt-${id++}`,

‎app/containers/Initialize/index.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class Initialize extends Component {
173173
requestInfo = (
174174
<div className='request-info'>
175175
<div className='link'>
176-
<a href='https://ide.coding.net' rel='noopener noreferrer' >{i18n`global.gotoIDE`}</a>
176+
<a href='https://studio.dev.tencent.com' rel='noopener noreferrer' >{i18n`global.gotoIDE`}</a>
177177
</div>
178178
</div>
179179
)
@@ -218,7 +218,7 @@ class Initialize extends Component {
218218
requestInfo = (
219219
<div className='request-info'>
220220
<div className='link'>
221-
<button className='btn btn-default' onClick={() => window.location.href = `https://ide.coding.net`} >{i18n`global.gotoIDE`}</button>
221+
<button className='btn btn-default' onClick={() => window.location.href = `https://studio.dev.tencent.com`} >{i18n`global.gotoIDE`}</button>
222222
</div>
223223
</div>
224224
)
@@ -245,8 +245,8 @@ class Initialize extends Component {
245245
requestInfo = (
246246
<div className='request-info'>
247247
{/* <button className='btn btn-primary' onClick={e => state.action({restartApp: this.props.restartApp})} >{i18n`global.tryMachine`}</button> */}
248-
<button className='btn btn-default' onClick={() => window.location.href = `https://ide.coding.net`} >{i18n`global.gotoIDE`}</button>
249-
<button className='btn btn-default' onClick={() => window.location.href = `https://ide.coding.net/ws/?ownerName=codingide&projectName=workstation-demo&isTry=true&open=README.md&envId=ide-tty-php-python-java`} >{i18n`global.tryIDE`}</button>
248+
<button className='btn btn-default' onClick={() => window.location.href = `https://studio.dev.tencent.com`} >{i18n`global.gotoIDE`}</button>
249+
{/* <button className='btn btn-default' onClick={() => window.location.href = `https://ide.coding.net/ws/?ownerName=codingide&projectName=workstation-demo&isTry=true&open=README.md&envId=ide-tty-php-python-java`} >{i18n`global.tryIDE`}</button> */}
250250
</div>
251251
)
252252
hintInfo = (

‎app/containers/Intro.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class Intro extends Component {
5050
<TabPanel>
5151
<div className='tab-panel'>
5252
<div className='tab-panel-img'>
53-
<img src='https://dn-coding-net-production-pp.qbox.me/5f892a55-9e72-4a2b-a834-92c883deebd0.png' alt='feature_1'/>
53+
<img src='https://dn-coding-net-production-pp.codehub.cn/5f892a55-9e72-4a2b-a834-92c883deebd0.png' alt='feature_1'/>
5454
</div>
5555
<div className='tab-panel-intro'>
5656
<h3>一键切换开发环境</h3>
@@ -63,7 +63,7 @@ class Intro extends Component {
6363
<TabPanel>
6464
<div className='tab-panel'>
6565
<div className='tab-panel-img'>
66-
<img src='https://dn-coding-net-production-pp.qbox.me/b0e4ce12-a4ed-4f78-b7c6-e2dcf66d32df.png' alt='feature_2'/>
66+
<img src='https://dn-coding-net-production-pp.codehub.cn/b0e4ce12-a4ed-4f78-b7c6-e2dcf66d32df.png' alt='feature_2'/>
6767
</div>
6868
<div className='tab-panel-intro'>
6969
<h3>多人协作</h3>
@@ -78,7 +78,7 @@ class Intro extends Component {
7878
<TabPanel>
7979
<div className='tab-panel'>
8080
<div className='tab-panel-img'>
81-
<img src='https://dn-coding-net-production-pp.qbox.me/cfa1e9da-9246-4da6-896f-009c445fc9fa.png' alt='feature_3' />
81+
<img src='https://dn-coding-net-production-pp.codehub.cn/cfa1e9da-9246-4da6-896f-009c445fc9fa.png' alt='feature_3' />
8282
</div>
8383
<div className='tab-panel-intro'>
8484
<h3>支持 Unicode 宽字符</h3>
@@ -100,11 +100,11 @@ class Intro extends Component {
100100
clickable: true
101101
}}>
102102
<div>
103-
<img src='https://dn-coding-net-production-pp.qbox.me/3c2d37c6-1e83-4811-acf2-2c779094ef53.png' alt='screen-1' />
103+
<img src='https://dn-coding-net-production-pp.codehub.cn/3c2d37c6-1e83-4811-acf2-2c779094ef53.png' alt='screen-1' />
104104
<div className="desc">小程序开发</div>
105105
</div>
106106
<div>
107-
<img src='https://dn-coding-net-production-pp.qbox.me/4837bb50-5338-42e8-8f3a-a24974e6e891.png' alt='screen-2' />
107+
<img src='https://dn-coding-net-production-pp.codehub.cn/4837bb50-5338-42e8-8f3a-a24974e6e891.png' alt='screen-2' />
108108
<div className="desc">协同编辑</div>
109109
</div>
110110
</Swiper>

0 commit comments

Comments
 (0)