Skip to content

PR: Merge Development branch into Master #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kristijanbartol wants to merge 14 commits into
base: master
Choose a base branch
from
Open

PR: Merge Development branch into Master #4

Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1ffa5d0
Dummy change. Commit to merge with master.
Dec 23, 2016
dda2b5f
Added simple buttons. Trying to append Latex $ on click.
Dec 23, 2016
431d72d
Removed js files that are not used
Dec 23, 2016
2db26bd
Removed fonts/
Dec 23, 2016
a91cf7b
Removed css/ as none of them are used
Dec 23, 2016
78f915b
Removed deploy.sh script
Dec 23, 2016
b501345
Merged master to development
hermanzdosilovic Dec 25, 2016
c1f06fe
Managed to add the simplest Latex functionality.
kristijanbartol Dec 26, 2016
3de6119
Now inserting string on current cursor position
kristijanbartol Dec 29, 2016
9dbb554
Simplified content replacement
kristijanbartol Dec 29, 2016
974d5f9
Using new MarkJax
hermanzdosilovic Jan 3, 2017
075c287
Fixed issues from Herman's comments. These were mostly failed attempt…
Jan 6, 2017
cb4eae0
Cursor now focusing back after inserting Latex signs.
Feb 21, 2017
2c6e1d9
Small fix.
Feb 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 54 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</head>

<body>
<textarea class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
<textarea id="inputText" class="col-xs-12 col-sm-6 col-md-6 col-lg-6">

@hermanzdosilovic hermanzdosilovic Jan 6, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This textarea doesn't need id, it is not used anywhere.

## CodeAssign Editor
Is a [SimpleMDE](https://simplemde.com/) Markdown editor powerd by [MarkJax](http://markjax.codeassign.com/) parser.

Expand All @@ -32,16 +32,66 @@
previewRender: markjax
});
```

And of course you can still write and use LaTeX:
$$\sum_{n=1}^{\infty} 2^{-n} = 1$$
</textarea>

<script>
function insertAfterCursor(string) {
var cursorCh = simplemde.codemirror.getCursor()["ch"]

@hermanzdosilovic hermanzdosilovic Jan 6, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing ;.

var cursorLine = simplemde.codemirror.getCursor()["line"]
var anchor = {line: cursorLine, ch: cursorCh}

simplemde.codemirror.doc.replaceRange(string, anchor)
}

var simplemde = new SimpleMDE({
previewRender: markjax,
previewRender: function(plainText, preview) {
setTimeout(function() {
markjax(plainText, preview);
}, 50);
return preview.innerHTML;
},
spellChecker: false,
indentWithTabs: false
indentWithTabs: false,
toolbar: [
"bold",
"italic",
"heading",
"|",
{
name: "latexExpr",
action: function latexExpr(editor) {
insertAfterCursor("$ $")
},
className: "fa fa-bar-chart-o",
title: "Latex Expression"
},
{
name: "latexEq",
action: function latexEq(editor) {
insertAfterCursor("$$ $$")
},
className: "fa fa-area-chart",
title: "Latex Equation"

@hermanzdosilovic hermanzdosilovic Jan 6, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both Latex Equation and Latex Expression are equations, only difference is the way they are shown, one is inline and other is block. So I think we should call these Inline math and Math block.

},
"|",
"quote",
"unordered-list",
"ordered-list",
"|",
"link",
"image",
"|",
"preview",
"side-by-side",
"fullscreen",
"|",
"guide"
],
"insertTexts": {
latexEq: ["", "%%"]

@hermanzdosilovic hermanzdosilovic Jan 6, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is not valid. We don't use % anywhere. https://github.com/NextStepWebs/simplemde-markdown-editor#configuration Check again what this configuration property means

}
});
SimpleMDE.toggleSideBySide(simplemde);
</script>
Expand Down