From 7f11dd63ee54789e7e67e9a21018e78d55b28ff0 Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Fri, 13 Mar 2015 00:20:58 +0800
Subject: [PATCH] win

---
 login.html                         |  2 ++
 node_modules/common.js             | 13 +++++++--
 node_modules/sync.js               |  3 +++
 package.json                       |  1 +
 public/css/theme/basic.less        |  1 +
 public/css/theme/presentation.css  |  1 +
 public/css/theme/presentation.less |  1 +
 public/css/theme/windows.css       |  1 +
 public/css/theme/windows.less      |  1 +
 public/js/app/note.js              |  5 +++-
 public/js/app/notebook.js          |  8 +++---
 public/js/app/page.js              | 42 ++++++++++++++++++------------
 public/js/common.js                |  3 ++-
 13 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/login.html b/login.html
index 432c95cd..0c536b1d 100644
--- a/login.html
+++ b/login.html
@@ -65,6 +65,8 @@ if(process.platform != 'darwin') {
 <script>
 var gui = require('nw.gui');
 var win = gui.Window.get();
+win.setAlwaysOnTop(true);
+// alert(win);
 // win.focus();
 // gui.Window.focus();
 
diff --git a/node_modules/common.js b/node_modules/common.js
index aab88224..f68ba3af 100644
--- a/node_modules/common.js
+++ b/node_modules/common.js
@@ -30,6 +30,13 @@ var Common = {
 		this._uuid++;
 		return ((new Date()).getTime()) + '_' + this._uuid;
 	},
+	// 得到目录分隔符
+	getPathSep: function() { 
+		if(process.platform.indexOf('win') != -1) {
+			return "\"";
+		}
+		return '/';
+	},
 	isOk: function(ret) {
 		if(!ret) {
 			return ret;
@@ -109,14 +116,16 @@ var Common = {
 		if(!fullFilePath) {
 			return ret;
 		}
-		var strs = fullFilePath.split('/');
+		var strs = fullFilePath.split(this.getPathSep());
 		if(strs.length == 1) {
-			ret.name = strs;
+			ret.name = strs[0];
 		} else {
 			ret.name = strs[strs.length - 1];
 			strs.pop();
 			ret.path = strs.join('/');
 		}
+		// console.log("---");
+		// console.log(ret);
 		var names = ret.name.split('.');
 		if(names.length > 1) {
 			ret.ext = names[names.length - 1];
diff --git a/node_modules/sync.js b/node_modules/sync.js
index dceacd07..603b960f 100644
--- a/node_modules/sync.js
+++ b/node_modules/sync.js
@@ -89,6 +89,7 @@ var Sync = {
 	},
 
 	// 停止同步
+	// 第一次，note.html -> login.html(使得_stop: true), -> note.html fullSync，一看，是stop
 	_stop: false,
 	stop: function() {
 		var me = this;
@@ -489,6 +490,7 @@ var Sync = {
 	// 全量同步
 	fullSync: function(callback) {
 		var me = this;
+		me._stop = false;
 		me._initSyncInfo();
 
 		// Web.syncNotebookFinish();
@@ -569,6 +571,7 @@ var Sync = {
 	},
 	incrSync: function(again) {
 		var me = this;
+		me._stop = false;
 		me._initSyncInfo();
 
 		// again表示重来
diff --git a/package.json b/package.json
index 122a175f..1e49e179 100755
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "version": "0.1",
   "main": "note.html",
   "window": {
+    "icon": "public/images/logo/leanote_icon_blue.png",
     "toolbar": false,
     
     "frame": false,
diff --git a/public/css/theme/basic.less b/public/css/theme/basic.less
index fb4dd273..1d35dea5 100644
--- a/public/css/theme/basic.less
+++ b/public/css/theme/basic.less
@@ -1544,6 +1544,7 @@ html,body, #page, #pageInner {
 #noteAndEditor {
 	background-color: #fff;
 }
+
 body {
 	// display: none;
 	-webkit-user-select: none; // input, textarea还是可以选择的
diff --git a/public/css/theme/presentation.css b/public/css/theme/presentation.css
index 34b698d9..8def3e8d 100644
--- a/public/css/theme/presentation.css
+++ b/public/css/theme/presentation.css
@@ -228,6 +228,7 @@ body {
 }
 .pren-tool {
   position: fixed;
+  -webkit-user-select: none;
   right: 0;
   top: 0;
   bottom: 0;
diff --git a/public/css/theme/presentation.less b/public/css/theme/presentation.less
index 479f9a53..89eafd2f 100644
--- a/public/css/theme/presentation.less
+++ b/public/css/theme/presentation.less
@@ -185,6 +185,7 @@ body {
 }
 .pren-tool {
 	position: fixed;
+	-webkit-user-select: none;
 	right: 0;
 	top: 0;
 	bottom: 0;
diff --git a/public/css/theme/windows.css b/public/css/theme/windows.css
index 0e357f23..dbb310f0 100644
--- a/public/css/theme/windows.css
+++ b/public/css/theme/windows.css
@@ -7,6 +7,7 @@
 }
 *::-webkit-scrollbar {
   width: 6px;
+  height: 6px;
   background-color: transparent;
   position: absolute;
   -webkit-transform: translatez(0);
diff --git a/public/css/theme/windows.less b/public/css/theme/windows.less
index 9ea4a455..edbdd9e8 100644
--- a/public/css/theme/windows.less
+++ b/public/css/theme/windows.less
@@ -17,6 +17,7 @@
 *::-webkit-scrollbar
 {
 	width: 6px;
+	height: 6px;
 	// background-color: #F5F5F5;
 	background-color: transparent;
 	position: absolute;
diff --git a/public/js/app/note.js b/public/js/app/note.js
index 14e0ac2e..9c94df15 100644
--- a/public/js/app/note.js
+++ b/public/js/app/note.js
@@ -1193,12 +1193,15 @@ Note.saveNote = function(e) {
     	return false;
     } else {
     }
+
+
     // copy, paste
     if(e.ctrlKey || e.metaKey) {
 	    if(num == 67) { // ctrl + c
 	    	document.execCommand('copy');
 	    } else if(num == 86) { // ctrl + v
-	    	document.execCommand('paste');
+	    	// 不能要, 要的话会有两次paste
+	    	// document.execCommand('paste');
 	    } else if(num == 65) { // ctrl + a
 	    	document.execCommand('selectAll');
 	    } else if(num == 88) { // ctrl + x
diff --git a/public/js/app/notebook.js b/public/js/app/notebook.js
index 57682347..b92ec83b 100644
--- a/public/js/app/notebook.js
+++ b/public/js/app/notebook.js
@@ -487,11 +487,11 @@ Notebook.changeNav = function() {
 	
 	// 移动, 复制重新来, 因为nav变了, 移动至-----的notebook导航也变了
 	// 这里速度很慢
-	var t1 = (new Date()).getTime();
+	// var t1 = (new Date()).getTime();
 	Note.initContextmenu();
-	Share.initContextmenu(Note.notebooksCopy);
-	var t2 = (new Date()).getTime();
-	log(t2-t1);
+	// Share.initContextmenu(Note.notebooksCopy);
+	// var t2 = (new Date()).getTime();
+	// log(t2-t1);
 }
 
 /**
diff --git a/public/js/app/page.js b/public/js/app/page.js
index 336aa34a..a670879f 100644
--- a/public/js/app/page.js
+++ b/public/js/app/page.js
@@ -161,6 +161,7 @@ var Resize = {
 				NotebookWidth: UserInfo.NotebookWidth, 
 				NoteListWidth: UserInfo.NoteListWidth
 			}, function() {
+				// alert(UserInfo.NotebookWidth);
 			});
 		}
 		self.lineMove = false;
@@ -476,6 +477,19 @@ function scrollTo(self, tagName, text) {
 	}
 }
 
+// 设置宽度， 三栏
+function setLayoutWidth() {
+	//------------------------
+	// 界面设置, 左侧是否是隐藏的
+	UserInfo.NotebookWidth = UserInfo.NotebookWidth || $("#notebook").width();
+	UserInfo.NoteListWidth = UserInfo.NoteListWidth || $("#noteList").width();
+	
+	Resize.init();
+	// alert(UserInfo.NotebookWidth);
+	Resize.set3ColumnsWidth(UserInfo.NotebookWidth, UserInfo.NoteListWidth);
+	Resize.setMdColumnWidth(UserInfo.MdEditorWidth);
+}
+
 //--------------
 // 调用之
 $(function() {
@@ -540,15 +554,6 @@ $(function() {
 		return preHeight < maxHeight ? preHeight : maxHeight;
 	}
 	
-	//------------------------
-	// 界面设置, 左侧是否是隐藏的
-	UserInfo.NotebookWidth = UserInfo.NotebookWidth || $("#notebook").width();
-	UserInfo.NoteListWidth = UserInfo.NoteListWidth || $("#noteList").width();
-	
-	Resize.init();
-	Resize.set3ColumnsWidth(UserInfo.NotebookWidth, UserInfo.NoteListWidth);
-	Resize.setMdColumnWidth(UserInfo.MdEditorWidth);
-	
 	// markdown preview下的a不能点击
 	$('#preview-contents').on('click', 'a', function(e) {
 		e.preventDefault();
@@ -1045,6 +1050,7 @@ function fullSync(callback) {
 // 增量同步
 function incrSync() {
 	log('incr sync');
+	Note.showSpin();
 	SyncService.incrSync();
 }
 
@@ -1113,7 +1119,13 @@ var State = {
 				$("#mainMask").html("");
 				$("#mainMask").hide(0);
 			}, 100);
-		})
+		});
+
+		// end
+		// 打开时，同步一下
+		setTimeout(function() {
+			incrSync();
+		}, 500);
 		// $('body').show();
 	},
 
@@ -1155,6 +1167,7 @@ var State = {
 		}
 
 		this.recoverAfter();
+
 	}
 };
 
@@ -1225,11 +1238,6 @@ function initPage() {
 			// init notebook后才调用
 			// initSlimScroll();
 			LeaAce.handleEvent();
-
-			// end
-			// 开始时显示loading......
-			// 隐藏mask
-			
 		});
 	};
 
@@ -1247,8 +1255,10 @@ function initPage() {
 	 		}
 	 		$('#username').text(UserInfo.Email);
 	 		userMenu();
+	 		setLayoutWidth();
 		} else {
-			location.href = 'login.html';
+			switchAccount();
+			// location.href = 'login.html';
 		}
 	});
 }
diff --git a/public/js/common.js b/public/js/common.js
index 70726699..952c2d93 100644
--- a/public/js/common.js
+++ b/public/js/common.js
@@ -1377,6 +1377,7 @@ function switchAccount() {
 	win.close();
 }
 
+// 没有一处调用
 function commonCmd(e) {
 	var num = e.which ? e.which : e.keyCode;
     // copy, paste
@@ -1385,7 +1386,7 @@ function commonCmd(e) {
 	    	document.execCommand('copy');
 	    } else if(num == 86) { // ctrl + v
 	    	document.execCommand('paste');
-	    	console.log("paste--------------")
+	    	// console.log("paste--------------");
 	    } else if(num == 65) { // ctrl + a
 	    	document.execCommand('selectAll');
 	    } else if(num == 88) { // ctrl + x