mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 00:40:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolves #488 -- make https-y things links in the console

Browse source
This commit is contained in:
Peter Cottle 2018-10-19 15:08:14 +09:00
parent 85ae115fc2
commit c801f9ed46
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/js/react_views/CommandView.jsx
View file

@ -100,14 +100,26 @@ var CommandView = React.createClass({
var paragraphs = this.state.result.split("\n"); var paragraphs = this.state.result.split("\n");
var result = []; var result = [];
for (var i = 0; i < paragraphs.length; i++) { for (var i = 0; i < paragraphs.length; i++) {
result.push( if (paragraphs[i].startsWith('https://')) {
<p result.push(
key={'paragraph_' + i} <a
dangerouslySetInnerHTML={{ href={paragraphs[i]}
__html: paragraphs[i] key={'paragraph_' + i}
}} dangerouslySetInnerHTML={{
/> __html: paragraphs[i]
); }}
/>
);
} else {
result.push(
<p
key={'paragraph_' + i}
dangerouslySetInnerHTML={{
__html: paragraphs[i]
}}
/>
);
}
} }
return ( return (
<div className={'commandLineResult'}> <div className={'commandLineResult'}>

2
src/js/sandbox/index.js
View file

@ -228,7 +228,7 @@ var Sandbox = Backbone.View.extend({
var url = var url =
'https://learngitbranching.js.org/?NODEMO&command=importTreeNow%20' + escape(treeJSON); 'https://learngitbranching.js.org/?NODEMO&command=importTreeNow%20' + escape(treeJSON);
command.setResult( command.setResult(
intl.todo('Here is a link to the current state of the tree: ') + url intl.todo('Here is a link to the current state of the tree: ') + '\n' + url
); );
command.finishWith(deferred); command.finishWith(deferred);
}, },