From 968637ba8915f8c4cf8ef55f07d475ec454579eb Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Thu, 19 Feb 2015 20:19:51 +0800
Subject: [PATCH] ok

---
 node_modules/notebook.js |  6 +++---
 node_modules/sync.js     |  5 +++--
 note.html                |  3 +--
 public/js/app/page.js    | 15 +++++++++------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/node_modules/notebook.js b/node_modules/notebook.js
index aa6afd8f..c192afa1 100644
--- a/node_modules/notebook.js
+++ b/node_modules/notebook.js
@@ -297,9 +297,9 @@ var Notebook = {
 		notebook.LocalIsNew = false;
 		notebook.LocalIsDelete = false;
 
-		delete note['NumberNotes'];
-		delete note['UpdatedTime'];
-		delete note['CreatedTime'];
+		delete notebook['NumberNotes'];
+		delete notebook['UpdatedTime'];
+		delete notebook['CreatedTime'];
 
 		var serverNotebookId = notebook.NotebookId;
 		me.getNotebookIdByServerNotebookId(notebook.ParentNotebookId, function(parentNotebookId) {
diff --git a/node_modules/sync.js b/node_modules/sync.js
index b54d9f48..5371bdfa 100644
--- a/node_modules/sync.js
+++ b/node_modules/sync.js
@@ -457,7 +457,7 @@ var Sync = {
 		// 同步笔记本
 		me.syncNotebook(-1, function(ok) {
 			if(ok) {
-				log('------------------')
+				console.log('------------------')
 				// 同步笔记
 				me.syncNote(-1, function(ok) {
 					if(ok) {
@@ -467,6 +467,7 @@ var Sync = {
 							me.updateLastSyncState(function() {
 								// send changes
 								me.sendChanges();
+								callback && callback(me._syncInfo);
 							});
 						});
 					} else {
@@ -474,7 +475,7 @@ var Sync = {
 					}
 				});
 			} else {
-				log('no-------')
+				console.log('no-------')
 				callback && callback(me._syncInfo);
 			}
 		});
diff --git a/note.html b/note.html
index 95015696..5b8d0c2e 100755
--- a/note.html
+++ b/note.html
@@ -201,8 +201,7 @@ function log(o) {
             <div class="pull-right" id="myProfile">
               <div class="dropdown">
                 <a class="dropdown-toggle" data-toggle="dropdown"> 
-                  <span class="username">
-                   lifekkk@leanote.com
+                  <span class="username" id="username">
                   </span><i class="fa fa-angle-down account-more"></i>
                 </a>
                 <ul class="dropdown-menu li-a   " role="menu">
diff --git a/public/js/app/page.js b/public/js/app/page.js
index 4c2c39f6..6b039704 100644
--- a/public/js/app/page.js
+++ b/public/js/app/page.js
@@ -775,11 +775,7 @@ $(function() {
 		minLeft(false);
 	}
 	
-	// end
-	// 开始时显示loading......
-	// 隐藏mask
-	$("#mainMask").html("");
-	$("#mainMask").hide(100);
+
 	
 	// 4/25 防止dropdown太高
 	// dropdown
@@ -1352,6 +1348,12 @@ function initPage() {
 			// init notebook后才调用
 			// initSlimScroll();
 			LeaAce.handleEvent();
+
+			// end
+			// 开始时显示loading......
+			// 隐藏mask
+			$("#mainMask").html("");
+			$("#mainMask").hide(100);
 		});
 	};
 
@@ -1360,13 +1362,14 @@ function initPage() {
 		if(userInfo) {
 			UserInfo = userInfo;
 			// 之前已同步过, 就不要full sync了
-			if('LastSyncUsn' in UserInfo) {
+			if('LastSyncUsn' in UserInfo && UserInfo['LastSyncUsn'] > 0) {
 				_init();
 	 		} else {
 				fullSync(function() {
 					_init();
 				});
 	 		}
+	 		$('#username').text(UserInfo.Email);
 		} else {
 			location.href = 'login.html';
 		}