allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/6] allura git commit: [#7955] pass through options to CodeMirror's markdown and gfm modes
Date Fri, 11 Sep 2015 19:34:13 GMT
Repository: allura
Updated Branches:
  refs/heads/db/7955 d42c3364f -> 82e467791


[#7955] pass through options to CodeMirror's markdown and gfm modes


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4b1cbcca
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4b1cbcca
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4b1cbcca

Branch: refs/heads/db/7955
Commit: 4b1cbcca816da154802cda979acb58fd1c1ef2f8
Parents: d42c336
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Thu Sep 10 14:42:05 2015 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Thu Sep 10 14:42:05 2015 +0000

----------------------------------------------------------------------
 Allura/allura/lib/widgets/resources/css/markitup_sf.css | 4 ----
 Allura/allura/lib/widgets/resources/js/sf_markitup.js   | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/4b1cbcca/Allura/allura/lib/widgets/resources/css/markitup_sf.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/markitup_sf.css b/Allura/allura/lib/widgets/resources/css/markitup_sf.css
index 13676a6..31c5730 100644
--- a/Allura/allura/lib/widgets/resources/css/markitup_sf.css
+++ b/Allura/allura/lib/widgets/resources/css/markitup_sf.css
@@ -64,8 +64,4 @@
 }
 .CodeMirror .CodeMirror-code .cm-url {
   color: #33d;
-}
-/* this comes from ~~ strikethrough which we don't do.  Could also pass strikethrough:false
in mode config */
-.CodeMirror .CodeMirror-code .cm-strikethrough {
-  text-decoration: none;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/allura/blob/4b1cbcca/Allura/allura/lib/widgets/resources/js/sf_markitup.js
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/js/sf_markitup.js b/Allura/allura/lib/widgets/resources/js/sf_markitup.js
index c66562d..5513742 100644
--- a/Allura/allura/lib/widgets/resources/js/sf_markitup.js
+++ b/Allura/allura/lib/widgets/resources/js/sf_markitup.js
@@ -64,6 +64,12 @@ $(window).load(function() {
               tabSize: 4,
               toolbar: toolbar,
               previewRender: previewRender,
+              codeMirrorModeConfig: {
+                highlightFormatting: true,
+                allowAtxHeaderWithoutSpace: true,
+                strikethrough: false,
+                taskLists: false,
+              }
             });
             editor.render();
 


Mime
View raw message