From 739524205c99e030f1b3bb15ad31b2ada3b4f97a Mon Sep 17 00:00:00 2001
From: life <lealife@outlook.com>
Date: Fri, 1 Jan 2016 20:47:05 +0800
Subject: [PATCH] full sync fix

---
 node_modules/user.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/node_modules/user.js b/node_modules/user.js
index be229ca0..ed5d5322 100644
--- a/node_modules/user.js
+++ b/node_modules/user.js
@@ -442,7 +442,8 @@ User = {
 	fullSyncForce: function(callback) {
 		var me = this;
 		var userId = me.getCurActiveUserId();
-		db.users.update({UserId: userId}, {$set: {LastSyncUsn: -1, NotebookUsn: -1, NoteUsn: -1, TagUsn: -1}}, function() {
+		// 设为HasDB为true
+		db.users.update({UserId: userId}, {$set: {HasDB: true, LastSyncUsn: -1, NotebookUsn: -1, NoteUsn: -1, TagUsn: -1}}, function() {
 			// 删除本地账户所有数据
 			me.deleteUserAllData(userId, function () {
 				callback && callback();
@@ -640,7 +641,7 @@ User = {
 		var me = this;
 
 		// 判断当前db是否是全局的, 如果不是, 则初始化全局的
-		var names = ['notebooks', 'notes', 'tags', 'images', 'attachs', 'noteHistories'];
+		var names = ['notebooks', 'notes', 'tags',/* 'images',*/ 'attachs', 'noteHistories'];
 		var sourceDb = {};
 		if (me.hasDB) {
 			db.initIt(sourceDb, names, '', false);
@@ -649,7 +650,7 @@ User = {
 			sourceDb = db;
 		}
 
-		var names = ['notebooks', 'notes', 'tags', 'images', 'attachs'];
+		var names = ['notebooks', 'notes', 'tags', /*'images', */'attachs'];
 		var query = {UserId: userId};
 
 		if (!async) {
@@ -671,12 +672,12 @@ User = {
 					}
 
 					// 删除历史记录
-					me._deleteNoteHistories(sourceDb, docs, function () {
+					// me._deleteNoteHistories(sourceDb, docs, function () {
 						// 删除自己
 						dbIt.remove(query, { multi: true },function () {
 							cb();
 						});
-					});
+					// });
 				});
 			}
 			else {