Skip to content
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

Jump to bottom

leanote tinymce html code view and button "find and replace" fix #332

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

leanote tinymce html code view and button "find and replace" fix #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e530bd1
add Chart.js support
jim3ma Jan 16, 2018
19a7f6f
add emoji and mermaid support
jim3ma May 24, 2018
159dd1b
Merge remote-tracking branch 'upstream/master'
donaldtone Apr 6, 2019
c807ba7
add html source view & find and replace button fix
donaldtone Apr 6, 2019
effd3e8
tags view order show
donaldtone Apr 6, 2019
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
7 changes: 6 additions & 1 deletion note.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<!-- markdown theme -->
<link rel="stylesheet" href="public/themes/markdown/default/index.css" type="text/css" id="md-theme"/>

<link href="public/css-libs/emoji.css" rel="stylesheet">

<!-- theme -->
<link rel="stylesheet" href="public/themes/default.css" type="text/css"/>
<link rel="stylesheet" href="public/themes/presentation.css" type="text/css" disabled id="themePresentation"/>
Expand Down Expand Up @@ -665,12 +667,15 @@ <h4 class="modal-title modalTitle lang">Local account warning</h4>
<script src="public/js/app/notebook.js"></script>
<script src="public/js/object_id.js"></script>

<!-- mermaid -->
<script src="public/libs/uml/mermaid.js"></script>

<!-- 使用require js -->
<script src="public/js/require.js"></script>
<!-- 导入插件 执行 -->
<script src="public/js/main.js"></script>
<!-- markdown editor -->
<script src="public/md/main-v2.min.js"></script>
<script src="public/md/main-v2.js"></script>
<!-- extra额外 -->
<script src="public/js/dec/main.js"></script>

Expand Down
1 change: 1 addition & 0 deletions public/css-libs/emoji.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/js/app/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,13 +471,13 @@ function initEditor() {
// skin : "custom",
language: Api.curLang.indexOf('zh') >= 0 ? 'zh' : 'en', // 语言
plugins: [
"autolink link image leaui_mindmap lists charmap hr", "paste",
"code autolink link image leaui_mindmap lists charmap hr", "paste",
"searchreplace leanote_nav leanote_code tabfocus",
"table directionality textcolor"
], // nonbreaking

toolbar1: "formatselect | forecolor backcolor | bold italic underline strikethrough | image leaui_mindmap | leanote_code leanote_inline_code | bullist numlist | alignleft aligncenter alignright alignjustify",
toolbar2: "outdent indent blockquote | link unlink | table | hr removeformat | subscript superscript |searchreplace | pastetext | leanote_ace_pre | fontselect fontsizeselect",
toolbar2: "outdent indent blockquote | link unlink | table | hr removeformat | subscript superscript | searchreplace | pastetext | leanote_ace_pre code | fontselect fontsizeselect",

// 使用tab键: http://www.tinymce.com/wiki.php/Plugin3x:nonbreaking
// http://stackoverflow.com/questions/13543220/tiny-mce-how-to-allow-people-to-indent
Expand Down
5 changes: 5 additions & 0 deletions public/js/app/tag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ TagNav.prototype = {
// 更新tags，并重绘到左侧
setTags: function(tags) {
this.tags = tags || [];
// wdd add start
this.tags.sort(function(a, b){
return a.Tag.toLowerCase() > b.Tag.toLowerCase() ? 1 : -1;
});
// wdd add end
$('#tagNav').html('');
for(var i in this.tags) {
var noteTag = this.tags[i];
Expand Down
Loading