Skip to content

Update widget to macversion 2 #2

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

Draft
oxixes wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Update widget to macversion 2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<widget xmlns="http://wirecloud.conwet.fi.upm.es/ns/macdescription/1" vendor="CoNWeT" name="markdown-editor" version="0.1.2">
<widget xmlns="http://wirecloud.conwet.fi.upm.es/ns/macdescription/1" vendor="CoNWeT" name="markdown-editor" version="0.2.0">
<macversion>2</macversion>

<details>
<title>Markdown editor widget</title>
Expand Down Expand Up @@ -31,4 +32,11 @@
<contents src="index.html" useplatformstyle="true" />
<rendering height="300px" width="30%"/>

<scripts>
<script src="lib/js/marked.min.js" />
<script src="lib/js/simplemde.min.js" />
<script src="lib/js/highlight.pack.js" />
<script src="js/MarkdownEditor.js" />
</scripts>

</widget>
4 changes: 4 additions & 0 deletions src/doc/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v0.2.0

- Updated widget to macversion 2

## v0.1.2

- Added syntax highlight support
Expand Down
28 changes: 6 additions & 22 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<!--<link rel="stylesheet" type="text/css" href="https://rawgit.com/cbadke/simplemde-markdown-editor/force-textarea-synch/dist/simplemde.min.css" />-->
<link rel="stylesheet" type="text/css" href="lib/css/simplemde.min.css" />
<link rel="stylesheet" type="text/css" href="lib/css/default.css" />
<link rel="stylesheet" type="text/css" href="css/styles.css" />

<title>Markdown-editor widget</title>
</head>
<body>

<textarea id="textareaId"></textarea>
<link rel="stylesheet" type="text/css" href="lib/css/simplemde.min.css" />
<link rel="stylesheet" type="text/css" href="lib/css/default.css" />
<link rel="stylesheet" type="text/css" href="css/styles.css" />

<!--<script src="https://rawgit.com/cbadke/simplemde-markdown-editor/force-textarea-synch/dist/simplemde.min.js"></script>-->
<script src="lib/js/marked.min.js"></script>
<script src="lib/js/simplemde.min.js"></script>
<script type="text/javascript" src="lib/js/highlight.pack.js"></script>
<script src="js/MarkdownEditor.js"></script>
<script src="js/main.js"></script>
</body>
</html>
<body>
<textarea id="textareaId"></textarea>
</body>
32 changes: 13 additions & 19 deletions src/js/MarkdownEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
* Licensed under the Apache-2.0 license.
*/

/* globals SimpleMDE marked hljs*/
/* exported MarkdownEditor */
/* globals SimpleMDE marked hljs Wirecloud */

var MarkdownEditor = (function () {

Expand All @@ -18,7 +17,7 @@ var MarkdownEditor = (function () {
// =========================================================================
var toolbarButton;

var MarkdownEditor = function MarkdownEditor() {
var MarkdownEditor = function MarkdownEditor(MashupPlatform, shadowDOM, extra) {
// Allow links to be clicked
var markdown_renderer = new marked.Renderer();
markdown_renderer.link = function (href, title, text) {
Expand All @@ -36,6 +35,7 @@ var MarkdownEditor = (function () {
out += 'target="_blank"> ' + text + '</a>';
return out;
};

marked.setOptions({
xhtml: true,
renderer: markdown_renderer,
Expand All @@ -49,13 +49,15 @@ var MarkdownEditor = (function () {
}
});

const body = shadowDOM.querySelector("body");

SimpleMDE.toggleFullScreen = toggleFullScreen;
SimpleMDE.prototype.toggleFullScreen = function () {
toggleFullScreen(this);
toggleFullScreen(this, body);
};

var simplemde = new SimpleMDE({
element: document.getElementById("textareaId"),
element: shadowDOM.getElementById("textareaId"),
spellChecker: false,
previewRender: function (plainText) {
return marked(plainText);
Expand All @@ -81,7 +83,9 @@ var MarkdownEditor = (function () {
},
{
name: "fullscreen",
action: toggleFullScreen,
action: (editor) => {
toggleFullScreen(editor, body);
},
className: "fa fa-arrows-alt no-disable no-mobile",
title: "Fullscreen"
},
Expand Down Expand Up @@ -161,7 +165,7 @@ var MarkdownEditor = (function () {
cm.refresh();
};

var toggleFullScreen = function toggleFullScreen(editor) {
var toggleFullScreen = function toggleFullScreen(editor, body) {

// Set fullscreen
// var cm = editor.codemirror;
Expand All @@ -174,7 +178,7 @@ var MarkdownEditor = (function () {
toolbarButton.className += " active";

// enter full-screen
var e = document.body;
var e = body;
if (e.requestFullscreen) {
e.requestFullscreen();
} else if (e.webkitRequestFullscreen) {
Expand Down Expand Up @@ -204,16 +208,6 @@ var MarkdownEditor = (function () {
toolbarButton.className = toolbarButton.className.replace(/\s*active\s*/g, "");
}

// =========================================================================
// PRIVATE MEMBERS
// =========================================================================

/* test-code */
MarkdownEditor.prototype = {
};

/* end-test-code */

return MarkdownEditor;
Wirecloud.registerWidgetClass(document.currentScript, MarkdownEditor);

})();
14 changes: 0 additions & 14 deletions src/js/main.js
View file
Open in desktop

This file was deleted.