hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added 'quote' back to the exended wiki editor

Browse Source
This commit is contained in:
hyung-hwan 2016-01-23 14:11:15 +00:00
parent 7024bcd61d
commit 8664ed78f3
5 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
codepot/src/codepot/views/code_revision.php
View File

@ -709,6 +709,7 @@ $history = $file['history'];
if (!empty($related_issues)) if (!empty($related_issues))
{ {
print '<div><ul id="code_revision_related_issue_list" class="codepot-horizontal-list">'; print '<div><ul id="code_revision_related_issue_list" class="codepot-horizontal-list">';
print '<li><i class="fa fa-hand-o-right"></i> </li>';
foreach ($related_issues as $ri) foreach ($related_issues as $ri)
{ {
$hex_issueid = $this->converter->AsciiToHex ($ri->issueid); $hex_issueid = $this->converter->AsciiToHex ($ri->issueid);

11
codepot/src/codepot/views/wiki_editx.php
View File

@ -24,7 +24,7 @@
<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script> <script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" /> <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" />
<script type="text/javascript" src="<?php print base_url_make('/js/medium-editor.min.js')?>"></script> <script type="text/javascript" src="<?php print base_url_make('/js/medium-editor.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/medium-editor.min.css')?>" /> <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/medium-editor.min.css')?>" />
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/medium-editor-theme.min.css')?>" /> <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/medium-editor-theme.min.css')?>" />
@ -370,7 +370,7 @@ $(function () {
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
'subscript', 'superscript', 'removeFormat', 'subscript', 'superscript', 'removeFormat',
'pre', 'anchor', 'image', 'pre', 'anchor', 'image',
'orderedlist', 'unorderedlist', 'indent', 'outdent', 'orderedlist', 'unorderedlist', 'quote', 'indent', 'outdent',
'justifyLeft', 'justifyCenter', 'justifyRight', 'justifyFull', 'justifyLeft', 'justifyCenter', 'justifyRight', 'justifyFull',
'table'], 'table'],
diffLeft: 0, diffLeft: 0,
@ -459,6 +459,13 @@ $(function () {
shift: false, shift: false,
alt: true alt: true
}, },
{ // alt-q
command: 'append-blockquote',
key: 'Q',
meta: false,
shift: false,
alt: true
},
{ // alt-h { // alt-h
command: 'append-h1', command: 'append-h1',
key: 'H', key: 'H',

17
codepot/src/css/common.css
View File

@ -817,14 +817,23 @@ span.codepot-open-issue-count {
line-height: 0.9em; line-height: 0.9em;
} }
/* normal blockquote is for indentation */ */
.codepot-plain-text-view blockquote, .codepot-plain-text-view blockquote,
.codepot-styled-text-view blockquote, .codepot-styled-text-view blockquote,
.codepot-styled-text-preview blockquote { .codepot-styled-text-preview blockquote {
/*background: #F5F5F5;*/
background: inherit; background: inherit;
border-left: 3px solid #EEEEEE; margin-left: 2em;
margin: 1em 1em 1em 1em; margin-right: 2em;
padding: 0.5em 0.5em 0.5em 0.5em; }
.codepot-plain-text-view blockquote.codepot-formatted-block,
.codepot-styled-text-view blockquote.codepot-formatted-block,
.codepot-styled-text-preview blockquote.codepot-formatted-block {
background: #F5F5F5;
border-left: 5px solid #E0E0E0;
margin-left: 2em;
margin-right: 2em;
padding: 0.1em 0.5em 0.1em 0.5em;
} }
.codepot-plain-text-view pre, .codepot-plain-text-view pre,

4
codepot/src/js/medium-editor-tables.js
View File

@ -531,7 +531,7 @@ Table.prototype = {
// end codepot // end codepot
this._editor.pasteHTML( this._editor.pasteHTML(
'<table class="medium-editor-table" id="medium-editor-table"' + '<p>&nbsp;&nbsp;</p><table class="medium-editor-table" id="medium-editor-table"' +
' >' + ' >' +
// codepot // codepot
'<thead>' + '<thead>' +
@ -543,7 +543,7 @@ Table.prototype = {
'</tbody>' + '</tbody>' +
// codepot // codepot
//'</table>', { //'</table>', {
'</table><p></p>', { '</table><p>&nbsp;&nbsp;</p>', {
// end codepot // end codepot
cleanAttrs: [], cleanAttrs: [],
cleanTags: [] cleanTags: []

17
codepot/src/js/medium-editor.js
View File

@ -936,7 +936,22 @@ MediumEditor.extensions = {};
} }
} }
return doc.execCommand('formatBlock', false, tagName); // codepot
// return doc.execCommand('formatBlock', false, tagName);
var ret = doc.execCommand('formatBlock', false, tagName);
if (tagName == 'blockquote')
{
var node = window.getSelection().focusNode.parentNode;
console.log ("%o", node);
if (node && node.tagName.toLowerCase() == 'p')
node = node.parentNode;
if (node && node.tagName.toLowerCase() == 'blockquote')
node.classList.add ("codepot-formatted-block");
}
return ret;
// end codepot
}, },
/** /**