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

min left ok

Browse Source
This commit is contained in:
iiuazz
2014-09-12 09:55:16 +08:00
parent 4b723eb331
commit 85fd63baa5
8 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,7 @@ function log(o) {
</ul>
</div>
<div class="folderNote closed" id="">
<div class="folderNote closed" id="myShareNotebooks">
<div class="folderHeader">
<i class="fa fa-user fa-left"></i>
<span>
@ -277,7 +277,7 @@ function log(o) {
</div>
<!-- 缩小版 -->
<!-- 缩小版 todo 不要展示, 点击展开即可 -->
<div id="notebookMin">
<!-- 这里隐藏, 不要 -->
<div target="#notebookList" title="{{msg . "notebook"}}" class="minContainer">
@ -291,13 +291,9 @@ function log(o) {
</ul>
</div>
<div id="minShareNotebooks">
<!--
<div class="minContainer" target="" title="">
<div class="minContainer" target="#friendContainer0" title="{{msg . "share"}}">
<i class="fa fa-user"></i>
<ul class="dropdown-menu">
</ul>
</div>
-->
</div>
</div>

2
public/css/theme/default.css
View File

File diff suppressed because one or more lines are too long

3
public/css/theme/default.less
View File

@ -111,7 +111,7 @@ a.raw:hover {
border-radius: 5px;
background-color: #000;
cursor: pointer;
font-size: 16px;
font-size: 18px;
&:hover {
color: @hColor;
}
@ -277,6 +277,7 @@ a.raw:hover {
border-color: rgba(255, 255, 255, 0.3);
padding: 5px;
position: relative;
cursor: pointer;
i {
font-size: 20px;
color: #fff;

2
public/css/theme/simple.css
View File

File diff suppressed because one or more lines are too long

5
public/css/theme/simple.less
View File

@ -101,11 +101,9 @@ a.raw:hover {
}
}
span {
background-color: #000;
color: #fff;
border-radius: 5px;
cursor: pointer;
font-size: 14px;
font-size: 18px;
&:hover {
color: @hColor;
}
@ -264,6 +262,7 @@ a.raw:hover {
border-bottom: 1px solid #ccc;
padding: 5px;
position: relative;
cursor: pointer;
i {
font-size: 20px;
color: #000;

13
public/js/app/notebook.js
View File

@ -265,10 +265,19 @@ Notebook.searchNotebookForAddNote = function(key) {
var self = this;
if(key) {
var notebooks = self.tree.getNodesByParamFuzzy("Title", key);
if(isEmpty(notebooks)) {
notebooks = notebooks || [];
// 过滤下, 把new, trash过滤掉
var notebooks2 = [];
for(var i in notebooks) {
var notebookId = notebooks[i].NotebookId;
if(!self.isAllNotebookId(notebookId) && !self.isTrashNotebookId(notebookId)) {
notebooks2.push(notebooks[i]);
}
}
if(isEmpty(notebooks2)) {
$("#notebookNavForNewNote").html("");
} else {
$("#notebookNavForNewNote").html(self.getChangedNotebooks(notebooks));
$("#notebookNavForNewNote").html(self.getChangedNotebooks(notebooks2));
}
} else {
$("#notebookNavForNewNote").html(self.everNavForNewNote);

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

@ -131,22 +131,21 @@ $(function() {
});
// 左侧, folder 展开与关闭
$(".folderHeader").click(
function() {
var body = $(this).next();
var p = $(this).parent();
if (!body.is(":hidden")) {
$(".folderNote").removeClass("opened").addClass("closed");
$(".folderHeader").click(function() {
var body = $(this).next();
var p = $(this).parent();
if (!body.is(":hidden")) {
$(".folderNote").removeClass("opened").addClass("closed");
// body.hide();
p.removeClass("opened").addClass("closed");
$(this).find(".fa-angle-down").removeClass("fa-angle-down").addClass("fa-angle-right");
} else {
$(".folderNote").removeClass("opened").addClass("closed");
p.removeClass("opened").addClass("closed");
$(this).find(".fa-angle-down").removeClass("fa-angle-down").addClass("fa-angle-right");
} else {
$(".folderNote").removeClass("opened").addClass("closed");
// body.show();
p.removeClass("closed").addClass("opened");
$(this).find(".fa-angle-right").removeClass("fa-angle-right").addClass("fa-angle-down");
}
});
p.removeClass("closed").addClass("opened");
$(this).find(".fa-angle-right").removeClass("fa-angle-right").addClass("fa-angle-down");
}
});
tinymce.init({
setup: function(ed) {
@ -551,6 +550,7 @@ $(function() {
$("#logo").hide();
$("#leftSwitcher").hide();
$("#leftSwitcher2").show();
$("#leftNotebook .slimScrollDiv").hide();
if(save) {
updateLeftIsMin(true);
@ -568,6 +568,7 @@ $(function() {
$("#leftSwitcher2").hide();
$("#logo").show();
$("#leftSwitcher").show();
$("#leftNotebook .slimScrollDiv").show();
if(save) {
updateLeftIsMin(false);
@ -588,6 +589,7 @@ $(function() {
});
// 得到最大dropdown高度
// 废弃
function getMaxDropdownHeight(obj) {
var offset = $(obj).offset();
var maxHeight = $(document).height()-offset.top;
@ -599,17 +601,26 @@ $(function() {
var preHeight = $(obj).find("ul").height();
return preHeight < maxHeight ? preHeight : maxHeight;
}
// mini版
$("#notebookMin div.minContainer").hover(function() {
var target = $(this).attr("target");
// show的时候要计算高度, 防止过高
// 先show再计算, 不然高度有偏差
$(this).addClass("open");
$(this).find("ul").html($(target).html()).show(); // .height(getMaxDropdownHeight(this));
}, function() {
$(this).find("ul").hide();
// 点击展开
$("#notebookMin div.minContainer").click(function() {
var target = $(this).attr("target");
maxLeft(false);
if(target == "#notebookList") {
if($("#myNotebooks").hasClass("closed")) {
$("#myNotebooks .folderHeader").trigger("click");
}
} else if(target == "#tagNav") {
if($("#myTag").hasClass("closed")) {
$("#myTag .folderHeader").trigger("click");
}
} else {
if($("#myShareNotebooks").hasClass("closed")) {
$("#myShareNotebooks .folderHeader").trigger("click");
}
}
);
});
//------------------------
// 界面设置, 左侧是否是隐藏的

2
public/js/app/share.js
View File

@ -102,7 +102,7 @@ Share.renderShareNotebooks = function(sharedUserInfos, shareNotebooks) {
$shareNotebooks.append(header + body + "</div>")
// mainShare
$("#minShareNotebooks").append('<div class="minContainer" target="#' + friendId + '" title="' + username + ' 的分享"><i class="fa fa-user"></i><ul class="dropdown-menu"></ul></li>')
// $("#minShareNotebooks").append('<div class="minContainer" target="#' + friendId + '" title="' + username + ' 的分享"><i class="fa fa-user"></i><ul class="dropdown-menu"></ul></li>')
}
};