diff --git a/note.html b/note.html
index c0f78fbc..50e9ed6e 100755
--- a/note.html
+++ b/note.html
@@ -292,7 +292,7 @@ function log(o) {
diff --git a/public/js/app/note.js b/public/js/app/note.js
index fddffdf7..1b6e14ef 100644
--- a/public/js/app/note.js
+++ b/public/js/app/note.js
@@ -363,10 +363,13 @@ Note.curHasChanged = function(force) {
// 由content生成desc
// 换行不要替换
-Note.genDesc = function(content) {
+Note.genDesc = function(content, length) {
if(!content) {
return "";
}
+ if (!length) {
+ length = 20;
+ }
// 将, 替换成\n
/*
@@ -401,10 +404,10 @@ Note.genDesc = function(content) {
content = content.replace(//g, ">");
- if(content.length < 20) {
+ if(content.length < length) {
return content;
}
- return content.substring(0, 20);
+ return content.substring(0, length);
}
// 得到摘要
@@ -2398,7 +2401,8 @@ Note.initContextmenu = function() {
}
}
- this.menu.popup(gui.getCurrentWindow(), e.originalEvent.x, e.originalEvent.y);
+ // this.menu.popup(gui.getCurrentWindow(), e.originalEvent.x, e.originalEvent.y);
+ this.menu.popup(gui.getCurrentWindow(), e.pageX, e.pageY);
}
}
@@ -2976,6 +2980,7 @@ Note.batch = {
});
me.initContextmenu();
+ me.initBatchStatus();
},
initContextmenu: function () {
@@ -2983,19 +2988,19 @@ Note.batch = {
me.$batchMask.on('contextmenu', function (e) {
e.preventDefault();
- !Note.nowIsInShared ? Note.contextmenu.showMenu(e) : Share.contextmenu.showMenu(e);
+ Note.noteMenuSys.popup(e, null);
});
me.$batchMask.find('.batch-info .fa').click(function (e) {
e.preventDefault();
- e.pageX -= 90;
+
+ e.pageX -= 70;
e.pageY += 10;
- // 这导致其它dropdown不能隐藏
e.stopPropagation();
// 所以
$(document).click();
- !Note.nowIsInShared ? Note.contextmenu.showMenu(e) : Share.contextmenu.showMenu(e);
+ Note.noteMenuSys.popup(e, null);
});
},
@@ -3087,7 +3092,12 @@ Note.batch = {
},
$batchMask: $('#batchMask'),
$batchCtn: $('#batchCtn'),
- $batchNum: $('#batchMask .batch-info span'),
+
+ initBatchStatus: function () {
+ $('#batchMask .batch-status').html(getMsg(' notes selected'));
+ this.$batchNum = $('#batchMask .batch-info span');
+ },
+
_i: 1,
getRotate: function () {
var me = this;
@@ -3109,6 +3119,8 @@ Note.batch = {
var note = Note.getNote(noteId);
var title = note.Title || getMsg('unTitled');
var desc = note.Desc || '...';
+ // desc = substr(note.Content, 0, 200);
+
var $note = $('' + title + '
' + desc + '
');
me._notes[noteId] = $note;
var rotate = me.getRotate();
diff --git a/public/langs/zh-cn.js b/public/langs/zh-cn.js
index e242a4e8..a8a6be20 100644
--- a/public/langs/zh-cn.js
+++ b/public/langs/zh-cn.js
@@ -203,6 +203,7 @@
"Delete": "删除",
"Remove": "移除",
"Export": "导出",
+ "Export note": "导出笔记",
"Histories": "历史记录",
"Created": "创建",
"Updated": "更新",
@@ -278,6 +279,8 @@
"Confirm password": "确认密码",
"Username": "用户名",
"User exists": "用户已存在",
- "Local": "本地"
+ "Local": "本地",
+ "Please select a note firstly.": "请先选择一个笔记",
+ " notes selected": "当前选中了 篇笔记"
}
\ No newline at end of file
diff --git a/public/langs/zh-hk.js b/public/langs/zh-hk.js
index 29ff0e93..83c80c54 100644
--- a/public/langs/zh-hk.js
+++ b/public/langs/zh-hk.js
@@ -203,6 +203,7 @@
"Delete": "刪除",
"Remove": "移除",
"Export": "導出",
+ "Export note": "導出筆記",
"Histories": "歷史記錄",
"Created": "創建",
"Updated": "更新",
@@ -278,6 +279,8 @@
"Confirm password": "確認密碼",
"Username": "用戶名",
"User exists": "用戶已存在",
- "Local": "本地"
+ "Local": "本地",
+ "Please select a note firstly.": "請先選擇壹個筆記",
+ " notes selected": "當前選中了 篇筆記"
}
\ No newline at end of file