Skip to content

Commit

Permalink
Merge pull request #794 from pe4cey/bump-editor-version
Browse files Browse the repository at this point in the history
Fix editor to handle string literals that contain new lines
  • Loading branch information
pe4cey authored Jul 9, 2018
2 parents c2ff802 + 02550a2 commit da01f2e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"ascii-data-table": "^2.1.1",
"classnames": "^2.2.5",
"codemirror": "^5.29.0",
"cypher-codemirror": "1.1.2",
"cypher-codemirror": "1.1.3",
"dnd-core": "^2.5.1",
"file-saver": "^1.3.8",
"firebase": "^4.3.0",
Expand Down
4 changes: 2 additions & 2 deletions src/browser/modules/Stream/CypherScriptFrame/Summary.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const GenericSummary = ({ status }) => {
<PaddedStatsBar>
<StyledCypherInfoMessage>INFO</StyledCypherInfoMessage>
<MessageArea>
This query is waiting for it's turn. The excution is serial and will
break on first error.
This query is waiting for it's turn. The execution is serial and
will break on first error.
</MessageArea>
</PaddedStatsBar>
)
Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2528,15 +2528,15 @@ cyclist@~0.2.2:
version "0.2.2"
resolved "https://neo.jfrog.io/neo/api/npm/npm/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"

cypher-codemirror@1.1.2:
version "1.1.2"
resolved "https://neo.jfrog.io/neo/api/npm/npm/cypher-codemirror/-/cypher-codemirror-1.1.2.tgz#af57041062a9bcc92b4276b0e9c04c9a38f6993b"
cypher-codemirror@1.1.3:
version "1.1.3"
resolved "https://neo.jfrog.io/neo/api/npm/npm/cypher-codemirror/-/cypher-codemirror-1.1.3.tgz#ca7230adc8b697baabfdc4d552bfea5652ef3dfc"
dependencies:
cypher-editor-support "1.1.2"
cypher-editor-support "1.1.3"

cypher-editor-support@1.1.2:
version "1.1.2"
resolved "https://neo.jfrog.io/neo/api/npm/npm/cypher-editor-support/-/cypher-editor-support-1.1.2.tgz#361c546a7618e5422872ed411e7e1e6b20e9f11c"
cypher-editor-support@1.1.3:
version "1.1.3"
resolved "https://neo.jfrog.io/neo/api/npm/npm/cypher-editor-support/-/cypher-editor-support-1.1.3.tgz#5093f2de733b53adf334e382027f6d66615ab7db"
dependencies:
antlr4 "4.7.0"
fuzzaldrin "2.1.0"
Expand Down

0 comments on commit da01f2e

Please sign in to comment.