Skip to content

Commit 290afda

Browse files
brymon68brymon68
committed
added table formattign for tinymce pasting and better spacing for entity count
1 parent 9c8480d commit 290afda

File tree

9 files changed

+24
-12
lines changed

9 files changed

+24
-12
lines changed

‎public/asset-manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"main.css": "/static/css/main.23c18382.chunk.css",
3-
"main.js": "/static/js/main.9e589d3d.chunk.js",
4-
"main.js.map": "/static/js/main.9e589d3d.chunk.js.map",
3+
"main.js": "/static/js/main.50260d01.chunk.js",
4+
"main.js.map": "/static/js/main.50260d01.chunk.js.map",
55
"runtime~main.js": "/static/js/runtime~main.42ac5946.js",
66
"runtime~main.js.map": "/static/js/runtime~main.42ac5946.js.map",
77
"static/js/2.9e5a29d8.chunk.js": "/static/js/2.9e5a29d8.chunk.js",
88
"static/js/2.9e5a29d8.chunk.js.map": "/static/js/2.9e5a29d8.chunk.js.map",
99
"index.html": "/index.html",
10-
"precache-manifest.d1c4ae2dd57cff2bcf8c2e03b4330cf4.js": "/precache-manifest.d1c4ae2dd57cff2bcf8c2e03b4330cf4.js",
10+
"precache-manifest.25be1a73efaff600748a7b65f61b6daf.js": "/precache-manifest.25be1a73efaff600748a7b65f61b6daf.js",
1111
"service-worker.js": "/service-worker.js",
1212
"static/css/main.23c18382.chunk.css.map": "/static/css/main.23c18382.chunk.css.map",
1313
"static/media/scot_logo_473x473.png": "/static/media/scot_logo_473x473.981c5c79.png"

‎public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-eval' ; style-src 'self' 'unsafe-inline' blob:; frame-src 'self'; "><meta http-equiv="pragma" content="no-cache"/><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content=""><meta name="author" content=""><meta name="referrer" content="no-referrer"><title>SCOT 3.7</title><script type="text/javascript" src="/libs/tinymce/js/tinymce/tinymce.min.js"></script><link rel="stylesheet" href="/css/revl.css"><link rel="manifest" href="/manifest.json"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap.min.css"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap-grid.min.css"><link rel="stylesheet" href="/css/react-table.css"><link rel="stylesheet" href="/css/font-awesome.min.css"><link rel="stylesheet" href="/css/react-calendar.css"><link rel="stylesheet" href="/css/reactTags.css"><link rel="stylesheet" href="/css/jquery.qtip.css"><link rel="stylesheet" href="/css/table-twbs.css"><link rel="stylesheet" href="/css/jquery-ui.css"><link rel="stylesheet" href="/css/codemirror.min.css"><link rel="stylesheet" href="/css/react-datetime.css"><link rel="stylesheet" href="/libs/tablesorter-master/css/theme.default.css"><link rel="stylesheet" href="/css/styles.css"><link rel="stylesheet" href="/css/sandbox.css"><link rel="stylesheet" href="/css/scot.css"><script type="text/javascript" src="/libs/jquery-3.3.1/jquery.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="/libs/jquery-2.1.1.1-nav.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap-nav.min.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.widgets.js"></script><script src="/libs/tablesorter-master/js/widgets/widget-sortTbodies.js"></script><script type="text/javascript" src="/libs/jquery.qtip.js"></script><script type="text/javascript" src="/libs/jquery-ui.min.js"></script><script type="text/javascript" src="/libs/jquery.ba-urlinternal.min.js"></script><script type="text/javascript" src="/libs/d3.4_10_0.min.js"></script><script type="text/javascript" src="/libs/polybool.min.js"></script><script src="/libs/jquery.mark.min.js"></script><style>body{padding-bottom:40px;background-color:#fff}</style><link href="/static/css/main.23c18382.chunk.css" rel="stylesheet"></head><body><div id="notification"></div><div id="admin_notices"></div><span style="visibility:hidden;position:absolute;s-index:-5;top:0;left:0" id="invisible" class="details-subject"></span><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/static/js/runtime~main.42ac5946.js"></script><script src="/static/js/2.9e5a29d8.chunk.js"></script><script src="/static/js/main.9e589d3d.chunk.js"></script></body></html>
1+
<!doctype html><html lang="en"><head><meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-eval' ; style-src 'self' 'unsafe-inline' blob:; frame-src 'self'; "><meta http-equiv="pragma" content="no-cache"/><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content=""><meta name="author" content=""><meta name="referrer" content="no-referrer"><title>SCOT 3.7</title><script type="text/javascript" src="/libs/tinymce/js/tinymce/tinymce.min.js"></script><link rel="stylesheet" href="/css/revl.css"><link rel="manifest" href="/manifest.json"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap.min.css"><link rel="stylesheet" href="/libs/bootstrap/css/bootstrap-grid.min.css"><link rel="stylesheet" href="/css/react-table.css"><link rel="stylesheet" href="/css/font-awesome.min.css"><link rel="stylesheet" href="/css/react-calendar.css"><link rel="stylesheet" href="/css/reactTags.css"><link rel="stylesheet" href="/css/jquery.qtip.css"><link rel="stylesheet" href="/css/table-twbs.css"><link rel="stylesheet" href="/css/jquery-ui.css"><link rel="stylesheet" href="/css/codemirror.min.css"><link rel="stylesheet" href="/css/react-datetime.css"><link rel="stylesheet" href="/libs/tablesorter-master/css/theme.default.css"><link rel="stylesheet" href="/css/styles.css"><link rel="stylesheet" href="/css/sandbox.css"><link rel="stylesheet" href="/css/scot.css"><script type="text/javascript" src="/libs/jquery-3.3.1/jquery.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap.min.js"></script><script type="text/javascript" src="/libs/jquery-2.1.1.1-nav.min.js"></script><script type="text/javascript" src="/libs/bootstrap/js/bootstrap-nav.min.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.js"></script><script type="text/javascript" src="/libs/tablesorter-master/js/jquery.tablesorter.widgets.js"></script><script src="/libs/tablesorter-master/js/widgets/widget-sortTbodies.js"></script><script type="text/javascript" src="/libs/jquery.qtip.js"></script><script type="text/javascript" src="/libs/jquery-ui.min.js"></script><script type="text/javascript" src="/libs/jquery.ba-urlinternal.min.js"></script><script type="text/javascript" src="/libs/d3.4_10_0.min.js"></script><script type="text/javascript" src="/libs/polybool.min.js"></script><script src="/libs/jquery.mark.min.js"></script><style>body{padding-bottom:40px;background-color:#fff}</style><link href="/static/css/main.23c18382.chunk.css" rel="stylesheet"></head><body><div id="notification"></div><div id="admin_notices"></div><span style="visibility:hidden;position:absolute;s-index:-5;top:0;left:0" id="invisible" class="details-subject"></span><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="/static/js/runtime~main.42ac5946.js"></script><script src="/static/js/2.9e5a29d8.chunk.js"></script><script src="/static/js/main.50260d01.chunk.js"></script></body></html>

‎public/precache-manifest.d1c4ae2dd57cff2bcf8c2e03b4330cf4.js‎ renamed to ‎public/precache-manifest.25be1a73efaff600748a7b65f61b6daf.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ self.__precacheManifest = [
88
"url": "/static/js/runtime~main.42ac5946.js"
99
},
1010
{
11-
"revision": "9e589d3d22e13ec294dd",
12-
"url": "/static/js/main.9e589d3d.chunk.js"
11+
"revision": "50260d01465af351e7b7",
12+
"url": "/static/js/main.50260d01.chunk.js"
1313
},
1414
{
1515
"revision": "9e5a29d820795173515e",
1616
"url": "/static/js/2.9e5a29d8.chunk.js"
1717
},
1818
{
19-
"revision": "9e589d3d22e13ec294dd",
19+
"revision": "50260d01465af351e7b7",
2020
"url": "/static/css/main.23c18382.chunk.css"
2121
},
2222
{
23-
"revision": "f9e271ed9cf4523ae007cb38d2bbaf5d",
23+
"revision": "f0a3d127565319efed365d4a7fee865d",
2424
"url": "/index.html"
2525
}
2626
];

‎public/service-worker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
1515

1616
importScripts(
17-
"/precache-manifest.d1c4ae2dd57cff2bcf8c2e03b4330cf4.js"
17+
"/precache-manifest.25be1a73efaff600748a7b65f61b6daf.js"
1818
);
1919

2020
workbox.clientsClaim();

‎public/static/js/main.50260d01.chunk.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/static/js/main.50260d01.chunk.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/static/js/main.9e589d3d.chunk.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎public/static/js/main.9e589d3d.chunk.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎scot-ui/src/components/add_entry.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,11 @@ export default class AddEntryModal extends React.Component {
473473
}
474474
onEditorChange={this.handleEditorChange}
475475
init={{
476+
table_default_attributes: {
477+
border: "5",
478+
borderStyle: "solid",
479+
borderColor: "blue"
480+
},
476481
auto_focus: this.state.tinyID,
477482
selector: "textarea",
478483
browser_spellcheck: true,
@@ -489,6 +494,13 @@ export default class AddEntryModal extends React.Component {
489494
}
490495
args.content = replaceA(args.content) + " ";
491496
},
497+
paste_postprocess: (plugin, args) => {
498+
args.node.querySelectorAll("table").forEach(tableNode => {
499+
tableNode.setAttribute("border", "1");
500+
tableNode.setAttribute("cellpadding", "1");
501+
tableNode.setAttribute("cellspacing", "0");
502+
});
503+
},
492504
relative_urls: false,
493505
remove_script_host: false,
494506
link_assume_external_targets: true,

0 commit comments

Comments
 (0)