urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-27 18:34:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2245 from urbit/mp/os1/link-submit-fix

Browse Source 
link: hotfix - add "prop.groupPath" to link-submit.js
This commit is contained in:
matildepark 2020-02-06 20:01:03 -05:00 committed by GitHub
commit deb3d26d3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 60139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60083
pkg/arvo/app/link/js/index.js
View File

File diff suppressed because one or more lines are too long

114
pkg/interface/link/src/js/components/lib/link-submit.js
View File

@ -1,6 +1,5 @@
import React, { Component } from 'react'
import { api } from '../../api';
import React, { Component } from "react";
import { api } from "../../api";
export class LinkSubmit extends Component {
constructor() {
@ -9,106 +8,107 @@ export class LinkSubmit extends Component {
linkValue: "",
linkTitle: "",
linkValid: false
}
};
this.setLinkValue = this.setLinkValue.bind(this);
this.setLinkTitle = this.setLinkTitle.bind(this);
}
onClickPost() {
let link = this.state.linkValue;
let title = (this.state.linkTitle)
? this.state.linkTitle
: this.state.linkValue;
api.postLink(this.props.path, link, title).then((r) => {
this.setState({linkValue: "", linkTitle: ""});
let title = this.state.linkTitle
? this.state.linkTitle
: this.state.linkValue;
api.postLink(this.props.groupPath, link, title).then(r => {
this.setState({ linkValue: "", linkTitle: "" });
});
}
setLinkValid(link) {
let URLparser = new RegExp(/((?:([\w\d\.-]+)\:\/\/?){1}(?:(www)\.?){0,1}(((?:[\w\d-]+\.)*)([\w\d-]+\.[\w\d]+))){1}(?:\:(\d+)){0,1}((\/(?:(?:[^\/\s\?]+\/)*))(?:([^\?\/\s#]+?(?:.[^\?\s]+){0,1}){0,1}(?:\?([^\s#]+)){0,1})){0,1}(?:#([^#\s]+)){0,1}/);
let URLparser = new RegExp(
/((?:([\w\d\.-]+)\:\/\/?){1}(?:(www)\.?){0,1}(((?:[\w\d-]+\.)*)([\w\d-]+\.[\w\d]+))){1}(?:\:(\d+)){0,1}((\/(?:(?:[^\/\s\?]+\/)*))(?:([^\?\/\s#]+?(?:.[^\?\s]+){0,1}){0,1}(?:\?([^\s#]+)){0,1})){0,1}(?:#([^#\s]+)){0,1}/
);
let validURL = URLparser.exec(link);
if (!validURL) {
let checkProtocol = URLparser.exec("http://" + link);
if (checkProtocol) {
this.setState({linkValid: true});
this.setState({linkValue: "http://" + link});
this.setState({ linkValid: true });
this.setState({ linkValue: "http://" + link });
} else {
this.setState({linkValid: false})
this.setState({ linkValid: false });
}
} else if (validURL) {
this.setState({linkValid: true});
this.setState({ linkValid: true });
}
}
setLinkValue(event) {
this.setState({linkValue: event.target.value});
this.setState({ linkValue: event.target.value });
this.setLinkValid(event.target.value);
}
setLinkTitle(event) {
this.setState({linkTitle: event.target.value});
this.setState({ linkTitle: event.target.value });
}
render() {
let activeClasses = (this.state.linkValid)
? "green2 pointer"
: "gray2";
let activeClasses = this.state.linkValid ? "green2 pointer" : "gray2";
return (
<div className="relative ba b--gray4 b--gray2-d br1 w-100 mb6">
<textarea
className="pl2 bg-gray0-d white-d w-100 f8"
style={{
resize: "none",
height: 40,
paddingTop: 10
}}
placeholder="Paste link here"
onChange={this.setLinkValue}
spellCheck="false"
rows={1}
onKeyPress={e => {
if (e.key === "Enter") {
e.preventDefault();
this.onClickPost();
}
}}
value={this.state.linkValue}
className="pl2 bg-gray0-d white-d w-100 f8"
style={{
resize: "none",
height: 40,
paddingTop: 10
}}
placeholder="Paste link here"
onChange={this.setLinkValue}
spellCheck="false"
rows={1}
onKeyPress={e => {
if (e.key === "Enter") {
e.preventDefault();
this.onClickPost();
}
}}
value={this.state.linkValue}
/>
<textarea
className="pl2 bg-gray0-d white-d w-100 f8"
style={{
resize: "none",
height: 40,
paddingTop: 16
}}
placeholder="Enter title"
onChange={this.setLinkTitle}
spellCheck="false"
rows={1}
onKeyPress={e => {
if (e.key === "Enter") {
e.preventDefault();
this.onClickPost();
}
}}
value={this.state.linkTitle}
className="pl2 bg-gray0-d white-d w-100 f8"
style={{
resize: "none",
height: 40,
paddingTop: 16
}}
placeholder="Enter title"
onChange={this.setLinkTitle}
spellCheck="false"
rows={1}
onKeyPress={e => {
if (e.key === "Enter") {
e.preventDefault();
this.onClickPost();
}
}}
value={this.state.linkTitle}
/>
<button
className={"absolute bg-gray0-d f8 ml2 flex-shrink-0 " + activeClasses}
className={
"absolute bg-gray0-d f8 ml2 flex-shrink-0 " + activeClasses
}
disabled={!this.state.linkValid}
onClick={this.onClickPost.bind(this)}
style={{
bottom: 12,
right: 8
}}>
Post
Post
</button>
</div>
)
);
}
}