')
- }
+ }, function() {
+ $(this).removeClass("showIcon");
+ });
+
+ $(".friend-header i").click(function() {
+ var $this = $(this);
+ var $tree = $(this).parent().next();
+ if($tree.is(":hidden")) {
+ $tree.slideDown("fast");
+ $this.removeClass("fa-angle-right fa-angle-down").addClass("fa-angle-down");
+ } else {
+ $tree.slideUp("fast");
+ $this.removeClass("fa-angle-right fa-angle-down").addClass("fa-angle-right");
+ }
+ });
+
+ //-----------------------------
+ // contextmenu shareNotebooks
+ // 删除共享笔记本
+ var shareNotebookMenu = {
+ width: 150,
+ items: [
+ { text: "删除共享笔记本", icon: "", faIcon: "fa-trash-o", action: Share.deleteShareNotebook }
+ ],
+ onShow: applyrule,
+ onContextMenu: beforeContextMenu,
+
+ parent: "#shareNotebooks",
+ children: ".notebook-item",
+ };
+ function applyrule(menu) {
+ return;
+ }
+ // 默认共享不能删除
+ function beforeContextMenu() {
+ var notebookId = $(this).attr("notebookId");
+ return !Share.isDefaultNotebookId(notebookId);
+ }
+
+ var menuNotebooks = $("#shareNotebooks").contextmenu(shareNotebookMenu);
+
+ //---------------------------
+ // contextmenu shareNotebooks
+ // 删除某用户所有的
+ var shareUserMenu = {
+ width: 150,
+ items: [
+ { text: "删除所有共享", icon: "", faIcon: "fa-trash-o", action: Share.deleteUserShareNoteAndNotebook }
+ ],
+ parent: "#shareNotebooks",
+ children: ".friend-header",
+ };
+
+ var menuUser = $("#shareNotebooks").contextmenu(shareUserMenu);
+
+ $(".friend-header").on("click", ".notebook-setting", function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ var $p = $(this).parent();
+ menuUser.showMenu(e, $p);
+ });
+ $("#shareNotebooks .notebook-item").on("click", ".notebook-setting", function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ var $p = $(this).parent();
+ menuNotebooks.showMenu(e, $p);
+ });
};
Share.isDefaultNotebookId = function(notebookId) {
@@ -114,13 +204,12 @@ Share.isDefaultNotebookId = function(notebookId) {
// for list和for new
// 如果forNew没有, 那么还是保持我的nav
Share.toggleToSharedNav = function(userId, notebookId) {
+ var self = this;
// for list
- $("#sharedNotebookNavForListNote").html(Share.userNavs[userId].forList);
- $("#sharedNotebookNavForListNav").show();
- $("#curSharedNotebookForListNote").html(Share.notebookCache[notebookId].Title + '(' + Share.sharedUserInfos[userId].Username + ")");
- $("#myNotebookNavForListNav").hide();
+ $("#curNotebookForListNote").html(Share.notebookCache[notebookId].Title + '(' + Share.sharedUserInfos[userId].Username + ")");
// for new
+ // 如果该用户下有新建的note, 那么列出, 如果没有, 则列出我的笔记
var forNew = Share.userNavs[userId].forNew;
if(forNew) {
$("#notebookNavForNewSharedNote").html(forNew);
@@ -134,7 +223,7 @@ Share.toggleToSharedNav = function(userId, notebookId) {
// 得到第一个
var $f = $("#notebookNavForNewSharedNote li").eq(0);
curNotebookId = $f.attr("notebookId");
- curNotebookTitle = $f.text();
+ curNotebookTitle = $f.find(".new-note-left").text();
}
$("#curNotebookForNewSharedNote").html(curNotebookTitle + '(' + Share.sharedUserInfos[userId].Username + ')');
@@ -143,6 +232,11 @@ Share.toggleToSharedNav = function(userId, notebookId) {
$("#newSharedNote").show();
$("#newMyNote").hide();
+
+ } else {
+ // 展示出我的笔记
+ $("#newMyNote").show();
+ $("#newSharedNote").hide();
}
// 隐藏tag
@@ -156,7 +250,7 @@ Share.toggleToSharedNav = function(userId, notebookId) {
//3. 使用Note.RederNotes()
Share.changeNotebook = function(userId, notebookId) {
// 选中
- Notebook.selectNotebook($(t('#shareNotebooks a[notebookId="?"]', notebookId)));
+ Notebook.selectNotebook($(t('#friendContainer_? a[notebookId="?"]', userId, notebookId)));
// 改变nav!!!! TODO
Share.toggleToSharedNav(userId, notebookId);
@@ -206,13 +300,15 @@ Share.hasUpdatePerm = function(notebookId) {
//---------------------------
// 我删除别人共享给我的笔记本
Share.deleteShareNotebook = function(target) {
- var notebookId = $(target).attr("notebookId");
- var fromUserId = $(target).attr("fromUserId"); // 谁共享给了我 from
- ajaxGet("/share/DeleteShareNotebookBySharedUser", {notebookId: notebookId, fromUserId: fromUserId}, function(ret) {
- if(ret) {
- $(target).parent().remove();
- }
- });
+ if(confirm("Are you sure to delete it?")) {
+ var notebookId = $(target).attr("notebookId");
+ var fromUserId = $(target).closest(".friend-notebooks").attr("fromUserId"); // 谁共享给了我 from
+ ajaxGet("/share/DeleteShareNotebookBySharedUser", {notebookId: notebookId, fromUserId: fromUserId}, function(ret) {
+ if(ret) {
+ $(target).parent().remove();
+ }
+ });
+ }
}
Share.deleteShareNote = function(target) {
var noteId = $(target).attr("noteId");
@@ -224,12 +320,14 @@ Share.deleteShareNote = function(target) {
});
}
Share.deleteUserShareNoteAndNotebook = function(target) {
- var fromUserId = $(target).attr("fromUserId"); // 谁共享给了我 from
- ajaxGet("/share/deleteUserShareNoteAndNotebook", {fromUserId: fromUserId}, function(ret) {
- if(ret) {
- $(target).parent().remove();
- }
- });
+ if(confirm("Are you sure to delete all shared notebooks and notes?")) {
+ var fromUserId = $(target).attr("fromUserId"); // 谁共享给了我 from
+ ajaxGet("/share/deleteUserShareNoteAndNotebook", {fromUserId: fromUserId}, function(ret) {
+ if(ret) {
+ $(target).parent().remove();
+ }
+ });
+ }
}
// 新建shared note
@@ -260,20 +358,10 @@ Share.copySharedNote = function(target, contextmenuItem) {
}
Share.contextmenu = null;
-Share.initContextmenu = function() {
+Share.initContextmenu = function(notebooksCopy) {
if(Share.contextmenu) {
- Share.contextmenu.unbind("contextmenu");
+ Share.contextmenu.destroy();
}
- // 得到可移动的notebook
- var notebooksCopy = [];
-
- // 到时这个可以缓存起来
- $("#notebookNavForNewNote li .new-note-left").each(function() {
- var notebookId = $(this).attr("notebookId");
- var title = $(this).text();
- var copy = {text: title, notebookId: notebookId, action: Share.copySharedNote}
- notebooksCopy.push(copy);
- });
//---------------------
// context menu
@@ -316,58 +404,16 @@ Share.initContextmenu = function() {
}
$(function() {
- // 点击notebook
- $("#shareNotebooks").on("click", "ul li a", function() {
- var notebookId = $(this).attr("notebookId");
- var userId = $(this).attr("fromUserId");
- Share.changeNotebook(userId, notebookId);
- });
- // min
- $("#minShareNotebooks").on("click", "li", function() {
- var self = $(this).find("a");
- var notebookId = $(self).attr("notebookId");
- var userId = $(self).attr("fromUserId");
- Share.changeNotebook(userId, notebookId);
+ // note setting
+ $("#noteItemList").on("click", ".item-shared .item-setting", function(e) {
+ e.preventDefault();
+ e.stopPropagation();
+ // 得到ID
+ var $p = $(this).parent();
+ Share.contextmenu.showMenu(e, $p);
});
- //-----------------------------
- // contextmenu shareNotebooks
- // 删除共享笔记本
- var shareNotebookMenu = {
- width: 150,
- items: [
- { text: "删除共享笔记本", icon: "", faIcon: "fa-trash-o", action: Share.deleteShareNotebook }
- ],
- onShow: applyrule,
- onContextMenu: beforeContextMenu,
-
- parent: "#shareNotebooks .folderBody",
- children: "li a",
- };
- function applyrule(menu) {
- return;
- }
- // 默认共享不能删除
- function beforeContextMenu() {
- var notebookId = $(this).attr("notebookId");
- return !Share.isDefaultNotebookId(notebookId);
- }
- $("#shareNotebooks").contextmenu(shareNotebookMenu);
-
- //---------------------------
- // contextmenu shareNotebooks
- // 删除某用户所有的
- var shareUserMenu = {
- width: 150,
- items: [
- { text: "删除所有共享", icon: "", faIcon: "fa-trash-o", action: Share.deleteUserShareNoteAndNotebook }
- ],
- parent: "#shareNotebooks",
- children: ".folderHeader",
- };
-
- $("#shareNotebooks").contextmenu(shareUserMenu);
//---------------------------
// 新建笔记
@@ -387,16 +433,13 @@ $(function() {
var notebookId = $(this).parent().attr("notebookId");
var userId = $(this).parent().attr("userId");
- if($(this).text() == "Markdown") {
+ if($(this).text() == "M") {
Note.newNote(notebookId, true, userId, true);
} else {
Note.newNote(notebookId, true, userId);
}
});
- //------------------
- Share.initContextmenu();
-
//------------------
// 添加共享
$("#leanoteDialogRemote").on("click", ".change-perm", function() {
diff --git a/public/js/jquery.ztree.all-3.5.js b/public/js/jquery.ztree.all-3.5.js
index 582dee6..fa7bc87 100644
--- a/public/js/jquery.ztree.all-3.5.js
+++ b/public/js/jquery.ztree.all-3.5.js
@@ -1181,7 +1181,7 @@
}
// life
// 加入notebookId
- html.push("
0) ? "href='" + url + "'" : ""), " target='",view.makeNodeTarget(node),"' style='", fontStyle.join(''),
"'", ' notebookId="' + node.NotebookId + '" ');
if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {html.push("title='", title.replace(/'/g,"'").replace(//g,'>'),"'");}