conflict fixed

This commit is contained in:
life
2015-02-13 11:43:49 +08:00
parent faeb923b2a
commit ec4841a59d
6 changed files with 98 additions and 9 deletions

View File

@@ -15,7 +15,7 @@ Notebook.setCache = function(notebook) {
Notebook.cache[notebookId] = {};
}
$.extend(Notebook.cache[notebookId], notebook);
}
};
Notebook.getCurNotebookId = function() {
return Notebook.curNotebookId;