diff --git a/public/js/app/note.js b/public/js/app/note.js index 327ed2e6..ebacc8b2 100644 --- a/public/js/app/note.js +++ b/public/js/app/note.js @@ -19,30 +19,33 @@ Note.$itemList = $('#noteItemList'); Note.cacheByNotebookId = {all: {}}; Note.notebookIds = {}; // notebookId => true - -// 切换笔记视图 -Note.setViewMode = function(mode) { +// 初始化模版字符串 +(function() { + Note.itemTpl = {}; + Note.itemTplNoImg = {}; // blog, star, settings - Note.itemIsBlog = '
'; - if(mode === "list") { //list view - Note.itemTplNoImg = '
  • '; - Note.itemTplNoImg += Note.itemIsBlog + '

    ?

  • '; + var itemIsBlog = '
    '; - Note.itemTpl = '
  • '; - Note.itemTpl += Note.itemIsBlog + '

    ?

  • '; - } - else { // summary view - // 无image - Note.itemTplNoImg = '
  • '; - Note.itemTplNoImg += Note.itemIsBlog + '

    ?

    ? ?

    ?

  • '; + // list view + Note.itemTplNoImg.list = '
  • '; + Note.itemTplNoImg.list += itemIsBlog + '

    ?

  • '; + Note.itemTpl.list = '
  • '; + Note.itemTpl.list += itemIsBlog + '

    ?

  • '; - // 有image - Note.itemTpl = '
  • '; - Note.itemTpl += Note.itemIsBlog + '

    ?

    ? ?

    ?

  • '; - } + // summary view + Note.itemTplNoImg.summary = '
  • '; + Note.itemTplNoImg.summary += itemIsBlog + '

    ?

    ? ?

    ?

  • '; + Note.itemTpl.summary = '
  • '; + Note.itemTpl.summary += itemIsBlog + '

    ?

    ? ?

    ?

  • '; +})(); + +Note.getItemTpl = function() { + return Note.itemTpl[Config.view || 'summary']; } -Note.setViewMode(Config.view || "summary"); +Note.getItemTplNoImg = function() { + return Note.itemTplNoImg[Config.view ||'summary']; +} // 定时保存信息 Note.intervalTime = 10 * 1000; // 10秒 @@ -994,9 +997,9 @@ Note._getNoteHtmlObjct = function(note, isShared) { var tmp; if(note.ImgSrc) { - tmp = tt(Note.itemTpl, classes, this.newNoteSeq(), note.NoteId, Note.fixImageSrc(note.ImgSrc), note.Title, Notebook.getNotebookTitle(note.NotebookId), goNowToDatetime(note.UpdatedTime), note.Desc); + tmp = tt(Note.getItemTpl(), classes, this.newNoteSeq(), note.NoteId, Note.fixImageSrc(note.ImgSrc), note.Title, Notebook.getNotebookTitle(note.NotebookId), goNowToDatetime(note.UpdatedTime), note.Desc); } else { - tmp = tt(Note.itemTplNoImg, classes, this.newNoteSeq(), note.NoteId, note.Title, Notebook.getNotebookTitle(note.NotebookId), goNowToDatetime(note.UpdatedTime), note.Desc); + tmp = tt(Note.getItemTplNoImg(), classes, this.newNoteSeq(), note.NoteId, note.Title, Notebook.getNotebookTitle(note.NotebookId), goNowToDatetime(note.UpdatedTime), note.Desc); } // blog ? if(!note.IsBlog) { @@ -1041,9 +1044,9 @@ Note._renderNotes = function(notes, forNewNote, isShared, tang) { // 第几趟 var tmp; if(note.ImgSrc) { - tmp = tt(Note.itemTpl, classes, i, note.NoteId, Note.fixImageSrc(note.ImgSrc), note.Title, Notebook.getNotebookTitle(note.NotebookId), goNowToDatetime(note.UpdatedTime), note.Desc || ''); + tmp = tt(Note.getItemTpl(), classes, i, note.NoteId, Note.fixImageSrc(note.ImgSrc), note.Title, Notebook.getNotebookTitle(note.NotebookId), goNowToDatetime(note.UpdatedTime), note.Desc || ''); } else { - tmp = tt(Note.itemTplNoImg, classes, i, note.NoteId, note.Title, Notebook.getNotebookTitle(note.NotebookId), goNowToDatetime(note.UpdatedTime), note.Desc || ''); + tmp = tt(Note.getItemTplNoImg(), classes, i, note.NoteId, note.Title, Notebook.getNotebookTitle(note.NotebookId), goNowToDatetime(note.UpdatedTime), note.Desc || ''); } if(!note.IsBlog) { tmp = $(tmp); @@ -1128,7 +1131,7 @@ Note.newNote = function(notebookId, isShare, fromUserId, isMarkdown) { var notebookTitle = notebook ? notebook.Title : ""; var curDate = getCurDatetime(); - newItem = tt(Note.itemTplNoImg, baseClasses, me.newNoteSeq(), note.NoteId, note.Title, notebookTitle, curDate, ""); + newItem = tt(Note.getItemTplNoImg(), baseClasses, me.newNoteSeq(), note.NoteId, note.Title, notebookTitle, curDate, ""); newItem = $(newItem); newItem.find(".item-blog").hide(); diff --git a/public/js/app/page.js b/public/js/app/page.js index 264623ce..4dace4a9 100644 --- a/public/js/app/page.js +++ b/public/js/app/page.js @@ -1979,18 +1979,16 @@ function setMacTopMenu() { { label: 'Summary View', click: function() { - Note.setViewMode("summary"); + Config.view = 'summary'; Notebook.renderCurNotebook(); - Config.view = "summary"; Api.writeConfig(Config); }, }, { label: 'List View', click: function() { - Note.setViewMode("list"); + Config.view = 'list'; Notebook.renderCurNotebook(); - Config.view = "list"; Api.writeConfig(Config); }, },