xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
life
2014-05-13 21:19:29 +08:00
parent e3f4b50c53 bf6590eef9
commit cd61592f74
20 changed files with 128 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/views/Note/note-dev.html
View File

@ -166,9 +166,13 @@ function log(o) {
</a>
</div>
<div class="pull-right" style="line-height: 60px; margin-right:10px" id="toggleEditorMode">
<a href="#writing">{{msg . "writingMode"}}</a>
</div>
{{if eq .userInfo.Email "demo@leanote.com"}}
{{if .openRegister}}
<div class="pull-right" style="line-height: 60px; margin-right:10px">
<div class="pull-right" style="line-height: 60px; margin-right:10px" id="demoRegister">
<span>
{{msg . "demoRegister"}}
</span>
@ -176,10 +180,6 @@ function log(o) {
{{end}}
{{end}}
<div class="pull-right" style="line-height: 60px; margin-right:10px" id="toggleEditorMode">
<a href="#writing">{{msg . "writingMode"}}</a>
</div>
<!--
<ul id="setting" class="pull-right">
<li class="dropdown messages">
@ -464,7 +464,7 @@ function log(o) {
</div>
<div id="noteTitleDiv">
<input name="noteTitle" id="noteTitle" value="" placeholder="{{msg . "unTitled"}}">
<input name="noteTitle" id="noteTitle" value="" placeholder="{{msg . "unTitled"}}" tabindex="1" />
</div>
</div>
@ -488,7 +488,7 @@ function log(o) {
</div>
</div>
<!-- 由此可以算高度 -->
<div id="editorContent" name="editorContent">
<div id="editorContent" name="editorContent" tabindex="2" />
{{.noteContent}}
</div>
</div>
@ -501,7 +501,7 @@ function log(o) {
<div class="clearfix" id="mdEditorPreview">
<div id="left-column" class="pull-left">
<div id="wmd-panel-editor" class="wmd-panel-editor">
<textarea class="wmd-input theme" id="wmd-input" spellcheck="false"></textarea>
<textarea class="wmd-input theme" id="wmd-input" spellcheck="false" tabindex="3"></textarea>
</div>
</div>
<div id="right-column" class="pull-right">
@ -906,6 +906,7 @@ function log(o) {
</div>
</div>
<div class="hide" id="copyDiv"></div>
<div id="lock" style="position: fixed; left:0; top:0;z-index:100; background-color:#fff"></div>
</div>
</div>
</div>

51
app/views/Note/note.html
View File

@ -11,10 +11,22 @@
<link href="css/bootstrap.css" rel="stylesheet" />
<!-- 先加载, 没有样式, 宽度不定 -->
<link rel="stylesheet" href="tinymce/skins/custom/skin.min.css" type="text/css" />
<!-- leanote css -->
<link rel="stylesheet" href="css/theme/{{if .userInfo.Theme}}{{.userInfo.Theme}}{{else}}default{{end}}.css" type="text/css" id="themeLink" />
<script>
var hash = location.hash;
if(hash == "#writing") {
var files = '<link rel="stylesheet" href="css/theme/writting-overwrite.css" type="text/css" id="themeLink" />';
} else {
var files ='<link rel="stylesheet" href="css/theme/{{if .userInfo.Theme}}{{.userInfo.Theme}}{{else}}default{{end}}.css" type="text/css" id="themeLink" />';
}
document.write(files);
</script>
<link href="css/font-awesome-4.0.3/css/font-awesome.css" rel="stylesheet" />
<!-- For Develop writting mod -->
<script>
function log(o) {
@ -42,14 +54,14 @@ function log(o) {
<span id="leftSwitcher2" title="{{msg . "leftShow"}}">lea</span>
</div>
<!-- search -->
<div class="pull-left">
<div class="pull-left" id="searchWrap">
<form class="navbar-form form-inline col-lg-2 hidden-xs" id="searchNote">
<input class="form-control" placeholder="Search" type="text" id="searchNoteInput">
</form>
</div>
<!-- 全局按钮 -->
<div class="pull-left" style="line-height: 40px; margin-top: 10px;">
<div class="pull-left" style="" id="newNoteWrap">
<!-- 新建笔记 -->
<div id="newMyNote">
@ -57,11 +69,12 @@ function log(o) {
<i class="fa fa-file-o"></i>
{{msg . "newNote"}}
</a>
|
<span class="new-split">|</span>
<a id="newNoteMarkdownBtn" title="{{msg . "newMarkdown"}}">
Markdown
</a>
- <span id="curNotebookForNewNote" notebookId=""></span>
<span class="for-split"> - </span>
<span id="curNotebookForNewNote" notebookId=""></span>
<div class="dropdown" style="display: inline-block">
<a class="ios7-a dropdown-toggle"
id="dropdownMenu2" data-toggle="dropdown">
@ -78,11 +91,12 @@ function log(o) {
<i class="fa fa-file-o"></i>
{{msg . "newNote"}}
</a>
|
<span class="new-split">|</span>
<a id="newShareNoteMarkdownBtn" title="{{msg . "newMarkdown"}}">
Markdown
</a>
- <span id="curNotebookForNewSharedNote" notebookId="" userId=""></span>
<span class="for-split"> - </span>
<span id="curNotebookForNewSharedNote" notebookId="" userId=""></span>
<div class="dropdown" style="display: inline-block">
<a class="ios7-a dropdown-toggle"
id="dropdownMenu2" data-toggle="dropdown">
@ -94,11 +108,10 @@ function log(o) {
</div>
</div>
<div class="pull-left" style="line-height: 40px; margin-top: 10px; margin-left: 10px;" id="leanoteMsg">
<div class="pull-left" id="leanoteMsg">
<span id="msg" style="display: inline-block;"></span>
<img id="loading" style="visibility: hidden" src="/images/loading-a-20.gif" />
<span id="loading">
</span>
</div>
<!--
@ -153,9 +166,13 @@ function log(o) {
</a>
</div>
<div class="pull-right" style="line-height: 60px; margin-right:10px" id="toggleEditorMode">
<a href="#writing">{{msg . "writingMode"}}</a>
</div>
{{if eq .userInfo.Email "demo@leanote.com"}}
{{if .openRegister}}
<div class="pull-right" style="line-height: 60px; margin-right:10px">
<div class="pull-right" style="line-height: 60px; margin-right:10px" id="demoRegister">
<span>
{{msg . "demoRegister"}}
</span>
@ -240,7 +257,7 @@ function log(o) {
<div class="folderHeader">
<i class="fa fa-user fa-left"></i>
<span>
共享
{{msg . "share"}}
</span>
</div>
@ -447,7 +464,7 @@ function log(o) {
</div>
<div id="noteTitleDiv">
<input name="noteTitle" id="noteTitle" value="" placeholder="{{msg . "unTitled"}}">
<input name="noteTitle" id="noteTitle" value="" placeholder="{{msg . "unTitled"}}" tabindex="1" />
</div>
</div>
@ -461,6 +478,7 @@ function log(o) {
id="moreBtn"> <i class="fa fa-angle-down"></i>
</a>
</div>
<div class="editorBg"></div>
<div id="leanoteNav">
<h1>
<i class="fa fa-align-justify" title="文档导航"></i>
@ -470,19 +488,20 @@ function log(o) {
</div>
</div>
<!-- 由此可以算高度 -->
<div id="editorContent" name="editorContent">
<div id="editorContent" name="editorContent" tabindex="2" />
{{.noteContent}}
</div>
</div>
<div id="mdEditor">
<div id="wmd-button-bar" id="mdBar"></div>
<div class="editorBg"></div>
<!-- 为了scroll -->
<div class="clearfix" id="mdEditorPreview">
<div id="left-column" class="pull-left">
<div id="wmd-panel-editor" class="wmd-panel-editor">
<textarea class="wmd-input theme" id="wmd-input" spellcheck="false"></textarea>
<textarea class="wmd-input theme" id="wmd-input" spellcheck="false" tabindex="3"></textarea>
</div>
</div>
<div id="right-column" class="pull-right">

2
messages/msg.en
View File

@ -83,6 +83,8 @@ leftShow=Show slide bar
nav=Note nav
writingMode=Writing Mode
normalMode=Normal Mode
saving=Saving
saveSuccess=Save success
update=Update
create=Create

2
messages/msg.zh
View File

@ -84,6 +84,8 @@ leftShow=展开左侧
nav=文档导航
writingMode=写作模式
normalMode=普通模式
saving=正在保存
saveSuccess=保存成功
update=更新
create=创建

2
public/css/editor.css
View File

@ -1,2 +0,0 @@
html{margin-top:3px;padding:3px;border:1px solid #ebeff2;border-radius:5px;-webkit-border-radius:5px;border-width:1px;box-shadow:none}
*{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif}

24
public/css/editor.less
View File

@ -1,24 +0,0 @@
@bgColor: #fff;
@headerBgColor: #fff;
@fontFamily: 'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif;
@aWhiteColor: #fff;
@aBlackColor: #000;
@borderColor: #EBEFF2;
@headerHeight: 60px;
@hColor: #5AD4A0;
@titleColor: @hColor;
@fontSize: 14px;
html {
margin-top: 3px;
padding: 3px;
border: 1px solid @borderColor;
border-radius: 5px;
-webkit-border-radius: 5px;
border-width: 1px;
box-shadow: none;
}
* {
font-family: @fontFamily;
}

14
public/css/editor/editor.css
View File

@ -1,2 +1,12 @@
html{margin-top:3px;padding:3px;border:1px solid #ebeff2;border-radius:5px;-webkit-border-radius:5px;border-width:1px;box-shadow:none}
*{font-family:'Open Sans','Helvetica Neue',Arial,'Hiragino Sans GB','Microsoft YaHei','WenQuanYi Micro Hei',sans-serif}
html {
margin-top: 3px;
padding: 3px;
border: 1px solid #ebeff2;
border-radius: 5px;
-webkit-border-radius: 5px;
border-width: 1px;
box-shadow: none;
}
* {
font-family: 'Open Sans', 'Helvetica Neue', Arial, 'Hiragino Sans GB', 'Microsoft YaHei', 'WenQuanYi Micro Hei', sans-serif;
}

8
public/css/theme/writting-overwrite.css
View File

@ -751,7 +751,9 @@ body {
#newShareNoteMarkdownBtn,
.new-split,
#editorMask,
#sortType {
#sortType,
#myProfile,
#demoRegister {
display: none;
}
#mainMask {
@ -943,6 +945,7 @@ body {
#leanoteNav {
background-color: #fbfcf7;
opacity: 0.3;
right: -20px;
}
.new-note-right {
padding: 0 2px;
@ -955,3 +958,6 @@ body {
margin-top: 10px;
visibility: hidden;
}
#moreBtn {
right: 0 !important;
}

9
public/css/theme/writting-overwrite.less
View File

@ -844,7 +844,9 @@ html,body {
#newShareNoteMarkdownBtn,
.new-split,
#editorMask,
#sortType
#sortType,
#myProfile,
#demoRegister
{
display: none;
}
@ -1041,6 +1043,7 @@ html,body {
#leanoteNav {
background-color: @bgColor;
opacity: 0.3;
right: -20px;
}
.new-note-right {
@ -1055,5 +1058,7 @@ html,body {
visibility: hidden;
}
body {
}
#moreBtn {
right: 0 !important;
}

2
public/js/all.js
View File

File diff suppressed because one or more lines are too long

2
public/js/app/note-min.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/js/app/note.js
View File

@ -363,14 +363,14 @@ Note.curChangedSaveIt = function(force) {
Note.setNoteCache({"NoteId": hasChanged.NoteId, "UpdatedTime": (new Date()).format("yyyy-MM-ddThh:mm:ss.S")}, false);
// 保存之
showMsg("正在保存");
showMsg(getMsg("saving"));
ajaxPost("/note/UpdateNoteOrContent", hasChanged, function(ret) {
if(hasChanged.IsNew) {
// 缓存之, 后台得到其它信息
ret.IsNew = false;
Note.setNoteCache(ret, false);
}
showMsg("保存成功!", 1000);
showMsg(getMsg("saveSuccess"), 1000);
});
return hasChanged;

2
public/js/app/page-min.js vendored
View File

File diff suppressed because one or more lines are too long

20
public/js/app/page.js
View File

@ -729,8 +729,16 @@ editorMode.prototype.changeMode = function(isWritingMode) {
} else {
this.normalMode();
}
$("#moreBtn i").removeClass("fa-angle-up").addClass("fa-angle-down");
}
editorMode.prototype.normalMode = function() {
/*
var w = $(document).width();
var h = $(document).height();
$("#lock").css({right:0, bottom:0});
*/
var $c = $("#editorContent_ifr").contents();
$c.contents().find("#writtingMode").remove();
@ -743,10 +751,18 @@ editorMode.prototype.normalMode = function() {
theme += ".css";
$("#themeLink").attr("href", "/css/theme/" + theme);
$("#mceToolbar").css("height", "30px");
// $("#lock").animate({right:w},1000);
}
editorMode.prototype.writtingMode = function() {
/*
// $("body").fadeOut();
var w = $(document).width();
var h = $(document).height();
$("#lock").css({right:0, bottom:0});
// $("#lock").animate({right:0}, 0);
*/
$("#themeLink").attr("href", "/css/theme/writting-overwrite.css");
@ -762,6 +778,10 @@ editorMode.prototype.writtingMode = function() {
$("#noteItemListWrap, #notesAndSort").fadeOut();
});
// 点击扩展会使html的height生成, 切换后会覆盖css文件的
$("#mceToolbar").css("height", "40px");
// $("#lock").animate({right:w},1000);
// $("body").fadeIn();
}

2
public/js/common-min.js vendored
View File

File diff suppressed because one or more lines are too long

26
public/js/common.js
View File

@ -270,15 +270,35 @@ ajaxPostJson(
*/
//-----------------
// 切换编辑器时要修改tabIndex
function editorIframeTabindex(index) {
var $i = $("#editorContent_ifr");
if($i.size() == 0) {
setTimeout(function() {
editorIframeTabindex(index);
}, 100);
} else {
$i.attr("tabindex", index);
}
}
//切换编辑器
function switchEditor(isMarkdown) {
// 富文本永远是2
if(!isMarkdown) {
$("#editor").show();
$("#mdEditor").css("z-index", 1);
// 刚开始没有
editorIframeTabindex(2);
$("#wmd-input").attr("tabindex", 3);
$("#leanoteNav").show();
} else {
$("#mdEditor").css("z-index", 3).show();
editorIframeTabindex(3);
$("#wmd-input").attr("tabindex", 2);
$("#leanoteNav").hide();
}
}
@ -306,7 +326,9 @@ function setEditorContent(content, isMarkdown, preview) {
$("#wmd-preview").html(""); // 防止先点有的, 再点tinymce再点没内容的
if(!content || preview) { // 没有内容就不要解析了
$("#wmd-preview").html(preview).css("height", "auto");
ScrollLink.onPreviewFinished(); // 告诉scroll preview结束了
if(ScrollLink) {
ScrollLink.onPreviewFinished(); // 告诉scroll preview结束了
}
} else {
// 还要清空preview
if(MarkdownEditor) {

2
public/js/i18n/msg.en.js
View File

@ -1 +1 @@
var MSG = {"3th":"Third-party accounts","aboutLeanote":"About leanote","aboutMe":"About me","accountSetting":"Account","addNotebook":"Add notebook","all":"Newest","basicInfo":"Basic","blog":"Blog","blogInfo":"You can public your knowledge and leanote is your blog!","blogSet":"Set blog","blue":"blue","cancel":"Cancel","checkEmai":"Check email","clickAddTag":"Click to add Tag","close":"Close","confirmPassword":"Please confirm your password","cooperation":"Cooperation","cooperationInfo":"Collaborate with friends to improve your knowledge.","create":"Create","curUser":"Email","default":"Default","defaultShare":"Default sharing","demoRegister":"\u003ca href=\"/register\"\u003eSign up\u003c/a\u003e","editorTips":"Tips","editorTipsInfo":"\u003ch4\u003e1. Short cuts\u003c/h4\u003ectrl+shift+c Toggle code \u003cbr /\u003e ctrl+shift+i Insert/edit image \u003ch4\u003e2. shift+enter Get out of current block\u003c/h4\u003e eg. \u003cimg src=\"/images/outofcode.png\" style=\"width: 90px\"/\u003e in this situation you can use shift+enter to get out of current code block.","email":"Email","emailOrOthers":"Email or other contact way","findPassword":"Find password","findPasswordSendEmailOver":"We have already send the find password link to your email, please check out your email","findPasswordTimeout":"time out","forgetPassword ":" Forget password?","green":"green","hi":"Hi","history":"Histories","home":"Home","ing":"processing","inputEmail":"Email is required","inputPassword":"Password is required","inputPassword2":"Please input your password again","inputUsername":"Username(email) is required","knowledge":"Knowledge","knowledgeInfo":"Use leanote as a note, manage your knowledge in leanote.","leanoteBlog":"Blog","leftHidden":"Hidden slide bar","leftShow":"Show slide bar","login":"Sign in","loginSuccess":"login success","logining":"Sign in","logout":"Logout","moto":"your own cloud note!","myBlog":"Blog","myNote":"My note","myNotebook":"My notebook","myTag":"My tag","nav":"Note nav","newMarkdown":"New markdown note","newNote":"New note","newPassword":"New password","normalMode":"Normal Mode","notFound":"This page cann't found.","notGoodPassword":"Tt's not a good password, the length is at least 6","notebook":"Notebook","oldPassword":"Old password","or":"or","password":"Password","password2":"Confirm your password","passwordTips":"The length is at least 6","reFindPassword":"find password again","red":"red","register":"Sign up","registerSuccessAndRdirectToNote":"register success, now redirect to my note...","save":"Save","send":"Send","share":"Share","shareInfo":"Share your knowledge to your friends in leanote.","simple":"Simple","submit":"submit","suggestions":"Suggestions","suggestionsInfo":"help us to improve our service.","tag":"Tag","themeSetting":"Theme","trash":"Trash","try":"Try it","unTitled":"UnTitled","update":"Update","updateEmail":"Update email","updatePassword":"Update password","updatePasswordSuccessRedirectToLogin":"update password success and redirect to login page...","uploadImage":"Upload image","usernameOrEmail":"Username or email","usernameSetting":"Update username","welcomeUseLeanote":"Welcome!","writingMode":"Writing Mode","wrongEmail":"Wrong email","wrongPassword":"Wrong password","wrongUsernameOrPassword":"Wrong username or password","yellow":"yellow","yourContact":"Your contact","yourSuggestions":"Suggestions"};
var MSG = {"3th":"Third-party accounts","aboutLeanote":"About leanote","aboutMe":"About me","accountSetting":"Account","addNotebook":"Add notebook","all":"Newest","basicInfo":"Basic","blog":"Blog","blogInfo":"You can public your knowledge and leanote is your blog!","blogSet":"Set blog","blue":"blue","cancel":"Cancel","checkEmai":"Check email","clickAddTag":"Click to add Tag","close":"Close","confirmPassword":"Please confirm your password","cooperation":"Cooperation","cooperationInfo":"Collaborate with friends to improve your knowledge.","create":"Create","curUser":"Email","default":"Default","defaultShare":"Default sharing","demoRegister":"\u003ca href=\"/register\"\u003eSign up\u003c/a\u003e","editorTips":"Tips","editorTipsInfo":"\u003ch4\u003e1. Short cuts\u003c/h4\u003ectrl+shift+c Toggle code \u003cbr /\u003e ctrl+shift+i Insert/edit image \u003ch4\u003e2. shift+enter Get out of current block\u003c/h4\u003e eg. \u003cimg src=\"/images/outofcode.png\" style=\"width: 90px\"/\u003e in this situation you can use shift+enter to get out of current code block.","email":"Email","emailOrOthers":"Email or other contact way","findPassword":"Find password","findPasswordSendEmailOver":"We have already send the find password link to your email, please check out your email","findPasswordTimeout":"time out","forgetPassword ":" Forget password?","green":"green","hi":"Hi","history":"Histories","home":"Home","ing":"processing","inputEmail":"Email is required","inputPassword":"Password is required","inputPassword2":"Please input your password again","inputUsername":"Username(email) is required","knowledge":"Knowledge","knowledgeInfo":"Use leanote as a note, manage your knowledge in leanote.","leanoteBlog":"Blog","leftHidden":"Hidden slide bar","leftShow":"Show slide bar","login":"Sign in","loginSuccess":"login success","logining":"Sign in","logout":"Logout","moto":"your own cloud note!","myBlog":"Blog","myNote":"My note","myNotebook":"My notebook","myTag":"My tag","nav":"Note nav","newMarkdown":"New markdown note","newNote":"New note","newPassword":"New password","normalMode":"Normal Mode","notFound":"This page cann't found.","notGoodPassword":"Tt's not a good password, the length is at least 6","notebook":"Notebook","oldPassword":"Old password","or":"or","password":"Password","password2":"Confirm your password","passwordTips":"The length is at least 6","reFindPassword":"find password again","red":"red","register":"Sign up","registerSuccessAndRdirectToNote":"register success, now redirect to my note...","save":"Save","saveSuccess":"Save success","saving":"Saving","send":"Send","share":"Share","shareInfo":"Share your knowledge to your friends in leanote.","simple":"Simple","submit":"submit","suggestions":"Suggestions","suggestionsInfo":"help us to improve our service.","tag":"Tag","themeSetting":"Theme","trash":"Trash","try":"Try it","unTitled":"UnTitled","update":"Update","updateEmail":"Update email","updatePassword":"Update password","updatePasswordSuccessRedirectToLogin":"update password success and redirect to login page...","uploadImage":"Upload image","usernameOrEmail":"Username or email","usernameSetting":"Update username","welcomeUseLeanote":"Welcome!","writingMode":"Writing Mode","wrongEmail":"Wrong email","wrongPassword":"Wrong password","wrongUsernameOrPassword":"Wrong username or password","yellow":"yellow","yourContact":"Your contact","yourSuggestions":"Suggestions"};

2
public/js/i18n/msg.zh.js
View File

@ -1 +1 @@
var MSG = {"3th":"第三方登录","aboutLeanote":"关于leanote","aboutMe":"关于我","accountSetting":"帐户设置","addNotebook":"添加笔记本","all":"最新","basicInfo":"基本信息","blog":"博客","blogInfo":"将笔记公开, 让知识传播的更远!","blogSet":"博客设置","blue":"蓝色","cancel":"取消","checkEmai":"查收邮箱","clickAddTag":"点击添加标签","close":"关闭","confirmPassword":"两次密码输入不一致","cooperation":"协作","cooperationInfo":"分享给好友的同时也可以让你的好友和你一起来完善它.","create":"创建","curUser":"当前登录帐户","default":"默认","defaultShare":"默认共享","demoRegister":"\u003ca href=\"/register\"\u003e立即注册\u003c/a\u003e","editorTips":"帮助","editorTipsInfo":"\u003ch4\u003e1. 快捷键\u003c/h4\u003ectrl+shift+c 代码块切换 \u003cbr /\u003e ctrl+shift+i 插入/修改图片\u003ch4\u003e2. shift+enter 跳出当前区域\u003c/h4\u003e比如在代码块中\u003cimg src=\"/images/outofcode.png\" style=\"width: 90px\"/\u003e按shift+enter可跳出当前代码块.","email":"Email","emailOrOthers":"Email或其它联系方式","findPassword":"找回密码","findPasswordSendEmailOver":"已经将修改密码的链接发送到您的邮箱, 请查收邮件.","findPasswordTimeout":"链接已过期","forgetPassword ":" 忘记密码?","green":"绿色","hi":"Hi","history":"历史记录","home":"主页","ing":"正在处理","inputEmail":"请输入Email","inputPassword":"请输入密码","inputPassword2":"请再次输入密码","inputUsername":"请输入用户名或Email","knowledge":"知识","knowledgeInfo":"leanote是一个笔记, 你可以用它来管理自己的知识.","leanoteBlog":"官方博客","leftHidden":"隐藏左侧","leftShow":"展开左侧","login":"登录","loginSuccess":"登录成功, 正在跳转","logining":"正在登录","logout":"退出","moto":"不一样的笔记!","myBlog":"我的博客","myNote":"我的笔记","myNotebook":"我的笔记本","myTag":"我的标签","nav":"文档导航","newMarkdown":"新建Markdown笔记","newNote":"新建笔记","newPassword":"新密码","normalMode":"普通模式","notFound":"该页面不存在","notGoodPassword":"密码至少6位","notebook":"笔记本","oldPassword":"旧密码","or":"或","password":"密码","password2":"确认密码","passwordTips":"密码至少6位","reFindPassword":"重新找回密码","red":"红色","register":"注册","registerSuccessAndRdirectToNote":"注册成功, 正在转至我的笔记...","save":"保存","send":"发送","share":"分享","shareInfo":"你也可以将知识分享给你的好友.","simple":"简约","submit":"提交","suggestions":"建议","suggestionsInfo":"帮助我们完善leanote","tag":"标签","themeSetting":"主题设置","trash":"废纸篓","try":"体验一下","unTitled":"无标题","update":"更新","updateEmail":"修改Email","updatePassword":"修改密码","updatePasswordSuccessRedirectToLogin":"修改成功, 正在跳转到登录页","uploadImage":"上传图片","usernameOrEmail":"用户名或Email","usernameSetting":"用户名设置","welcomeUseLeanote":"欢迎使用leanote","writingMode":"写作模式","wrongEmail":"Email格式有误","wrongPassword":"密码有误","wrongUsernameOrPassword":"用户名或密码有误","yellow":"黄色","yourContact":"您的联系方式","yourSuggestions":"帮助完善leanote"};
var MSG = {"3th":"第三方登录","aboutLeanote":"关于leanote","aboutMe":"关于我","accountSetting":"帐户设置","addNotebook":"添加笔记本","all":"最新","basicInfo":"基本信息","blog":"博客","blogInfo":"将笔记公开, 让知识传播的更远!","blogSet":"博客设置","blue":"蓝色","cancel":"取消","checkEmai":"查收邮箱","clickAddTag":"点击添加标签","close":"关闭","confirmPassword":"两次密码输入不一致","cooperation":"协作","cooperationInfo":"分享给好友的同时也可以让你的好友和你一起来完善它.","create":"创建","curUser":"当前登录帐户","default":"默认","defaultShare":"默认共享","demoRegister":"\u003ca href=\"/register\"\u003e立即注册\u003c/a\u003e","editorTips":"帮助","editorTipsInfo":"\u003ch4\u003e1. 快捷键\u003c/h4\u003ectrl+shift+c 代码块切换 \u003cbr /\u003e ctrl+shift+i 插入/修改图片\u003ch4\u003e2. shift+enter 跳出当前区域\u003c/h4\u003e比如在代码块中\u003cimg src=\"/images/outofcode.png\" style=\"width: 90px\"/\u003e按shift+enter可跳出当前代码块.","email":"Email","emailOrOthers":"Email或其它联系方式","findPassword":"找回密码","findPasswordSendEmailOver":"已经将修改密码的链接发送到您的邮箱, 请查收邮件.","findPasswordTimeout":"链接已过期","forgetPassword ":" 忘记密码?","green":"绿色","hi":"Hi","history":"历史记录","home":"主页","ing":"正在处理","inputEmail":"请输入Email","inputPassword":"请输入密码","inputPassword2":"请再次输入密码","inputUsername":"请输入用户名或Email","knowledge":"知识","knowledgeInfo":"leanote是一个笔记, 你可以用它来管理自己的知识.","leanoteBlog":"官方博客","leftHidden":"隐藏左侧","leftShow":"展开左侧","login":"登录","loginSuccess":"登录成功, 正在跳转","logining":"正在登录","logout":"退出","moto":"不一样的笔记!","myBlog":"我的博客","myNote":"我的笔记","myNotebook":"我的笔记本","myTag":"我的标签","nav":"文档导航","newMarkdown":"新建Markdown笔记","newNote":"新建笔记","newPassword":"新密码","normalMode":"普通模式","notFound":"该页面不存在","notGoodPassword":"密码至少6位","notebook":"笔记本","oldPassword":"旧密码","or":"或","password":"密码","password2":"确认密码","passwordTips":"密码至少6位","reFindPassword":"重新找回密码","red":"红色","register":"注册","registerSuccessAndRdirectToNote":"注册成功, 正在转至我的笔记...","save":"保存","saveSuccess":"保存成功","saving":"正在保存","send":"发送","share":"分享","shareInfo":"你也可以将知识分享给你的好友.","simple":"简约","submit":"提交","suggestions":"建议","suggestionsInfo":"帮助我们完善leanote","tag":"标签","themeSetting":"主题设置","trash":"废纸篓","try":"体验一下","unTitled":"无标题","update":"更新","updateEmail":"修改Email","updatePassword":"修改密码","updatePasswordSuccessRedirectToLogin":"修改成功, 正在跳转到登录页","uploadImage":"上传图片","usernameOrEmail":"用户名或Email","usernameSetting":"用户名设置","welcomeUseLeanote":"欢迎使用leanote","writingMode":"写作模式","wrongEmail":"Email格式有误","wrongPassword":"密码有误","wrongUsernameOrPassword":"用户名或密码有误","yellow":"黄色","yourContact":"您的联系方式","yourSuggestions":"帮助完善leanote"};

2
public/tinymce/plugins/leanote_nav/plugin.js
View File

@ -27,7 +27,7 @@ tinymce.PluginManager.add('leanote_nav', function(editor) {
titles += "</ul>";
$("#leanoteNavContent").html(titles).height("auto"); // auto
if(!hs.length) {
$("#leanoteNavContent").html("&nbsp; 无");
$("#leanoteNavContent").html("&nbsp; Nothing...");
}
// 这里, resize Height

2
public/tinymce/plugins/leanote_nav/plugin.min.js vendored
View File

@ -1 +1 @@
tinymce.PluginManager.add("leanote_nav",function(t){function n(){var n=t.getBody(),o=$(n),a=o.html();if(e!=a){e=a;for(var i=o.find("h1,h2,h3,h4,h5,h6").toArray(),l="<ul>",h=0;h<i.length;++h){var c=$(i[h]).text(),r=i[h].tagName.toLowerCase();l+='<li class="nav-'+r+'"><a data-a="'+r+"-"+encodeURI(c)+'" onclick="scrollTo(this, \''+r+"', '"+c+"')\">"+c+"</a></li>"}l+="</ul>",$("#leanoteNavContent").html(l).height("auto"),i.length||$("#leanoteNavContent").html("&nbsp; 无");var d=$("#leanoteNavContent").height(),g=$("#editorContent_ifr").height()-29;d>g&&$("#leanoteNavContent").height(g)}}var e="";t.on("init",function(){window.setTimeout(function(){n(),t.on("setcontent beforeadd undo paste",n),t.on("ExecCommand",function(){n()}),t.on("click",function(){n(),$("body").trigger("click")})},0)})});
tinymce.PluginManager.add("leanote_nav",function(t){function n(){var n=t.getBody(),o=$(n),a=o.html();if(e!=a){e=a;for(var i=o.find("h1,h2,h3,h4,h5,h6").toArray(),h="<ul>",l=0;l<i.length;++l){var c=$(i[l]).text(),r=i[l].tagName.toLowerCase();h+='<li class="nav-'+r+'"><a data-a="'+r+"-"+encodeURI(c)+'" onclick="scrollTo(this, \''+r+"', '"+c+"')\">"+c+"</a></li>"}h+="</ul>",$("#leanoteNavContent").html(h).height("auto"),i.length||$("#leanoteNavContent").html("&nbsp; Nothing...");var d=$("#leanoteNavContent").height(),g=$("#editorContent_ifr").height()-29;d>g&&$("#leanoteNavContent").height(g)}}var e="";t.on("init",function(){window.setTimeout(function(){n(),t.on("setcontent beforeadd undo paste",n),t.on("ExecCommand",function(){n()}),t.on("click",function(){n(),$("body").trigger("click")})},0)})});