2.3 released

leanote · Jan 22, 2017 · 414a562 · 414a562
1 parent 405d6c6
commit 414a562
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 74 deletions.
diff --git a/main.js b/main.js
@@ -116,7 +116,19 @@ function removeEvents (win) {
   win.removeAllListeners('close');
 }
 
+function close (e, force) {
+  console.log('close:', force);
+  if (mainWindow) {
+    mainWindow.hide();
+    e && e.preventDefault();
+    mainWindow.webContents.send('closeWindow');
+  } else {
+    app.quit();
+  }
+}
+
 function bindEvents (win) {
+  mainWindow = win;
 
   // Emitted when the window is closed.
   win.on('closed', function() {
@@ -138,17 +150,6 @@ function bindEvents (win) {
     if(win && win.webContents)
       win.webContents.send('blurWindow');
   });
-
-  function close (e, force) {
-    console.log('close:', force);
-    if (win) {
-      win.hide();
-      e && e.preventDefault();
-      win.webContents.send('closeWindow');
-    } else {
-      app.quit();
-    }
-  }
 
   // 以前的关闭是真关闭, 现是是假关闭了
   // 关闭,先保存数据

diff --git a/node_modules/api.js b/node_modules/api.js
diff --git a/node_modules/sync.js b/node_modules/sync.js
diff --git a/node_modules/web.js b/node_modules/web.js
diff --git a/public/js/app/note.js b/public/js/app/note.js
@@ -847,21 +847,22 @@ Note.renderChangedNote = function(changedNote) {
 // 清空右侧note信息, 可能是共享的,
 // 此时需要清空只读的, 且切换到note edit模式下
 Note.clearNoteInfo = function() {
-        Note.clearCurNoteId();
-        Tag.input.clearTags();
-        $("#noteTitle").val("");
-        setEditorContent("");
+    Note.clearCurNoteId();
+    Tag.input.clearTags();
+    $("#noteTitle").val("");
+    setEditorContent("");
 
-        // markdown editor
-        /*
-        $("#wmd-input").val("");
-        $("#wmd-preview").html("");
-        */
+    // markdown editor
+    /*
+    $("#wmd-input").val("");
+    $("#wmd-preview").html("");
+    */
 
-        // 只隐藏即可
-        $("#noteRead").hide();
-    }
-    // 清除noteList导航
+    // 只隐藏即可
+    $("#noteRead").hide();
+};
+
+// 清除noteList导航
 Note.clearNoteList = function() {
     Note.noteItemListO.html(""); // 清空
 }
@@ -1252,23 +1253,31 @@ Note.hideSyncProgress = function() {
 Note.unConnected = function() {
     var me = this;
     me._syncWarningE.show();
-    SyncService.setSyncFinished();
+    SyncService.setSyncFinished(true);
     me.hideSpin();
     me._syncWarningE.data('reason', 'unConnected');
     me._syncWarningE.attr('title', 'Network error');
 };
+// 网络已经连接好了
+Note.connected = function() {
+    var me = this;
+    if (me._syncWarningE.data('reason') == 'unConnected') {
+    	me._syncWarningE.data('reason', '-');
+    	me._syncWarningE.hide();
+    }
+};
 Note.notLogin = function() {
     var me = this;
     me._syncWarningE.show();
     me.hideSpin();
-    SyncService.setSyncFinished();
+    SyncService.setSyncFinished(true);
     me._syncWarningE.data('reason', 'notLogin');
     me._syncWarningE.attr('title', getMsg('You need to sign in Leanote'));
 };
 Note.needUpgradeAccount = function() {
     var me = this;
     me.hideSpin();
-    SyncService.setSyncFinished();
+    SyncService.setSyncFinished(true);
     me._syncWarningE.show();
     me._syncWarningE.data('reason', 'NEED-UPGRADE-ACCOUNT');
     me._syncWarningE.attr('title', getMsg('You need to upgrade Leanote account'));
@@ -1284,7 +1293,7 @@ Note.fixNetOrAuthError = function() {
     } else if (reason == 'notLogin') {
         alert(getMsg('You need to sign in Leanote'));
         // 弹出登录框登录之, 重新弹出
-        window.open('login.html?ref=needLogin');
+        toLogin();
 
         // 需要升级Leanote
     } else if (reason == 'NEED-UPGRADE-ACCOUNT') {

diff --git a/public/js/app/page.js b/public/js/app/page.js
@@ -1216,8 +1216,8 @@ LeaAce = {
 function fullSync(callback) {
     log('full sync');
     $('.loading-footer').show();
-    SyncService.fullSync(function(ret, ok) {
-        callback && callback(ok);
+    SyncService.fullSync(function(err, ret) {
+        callback && callback(err, ret);
     });
 }
 
@@ -1525,9 +1525,29 @@ function initPage(initedCallback) {
             else if ('LastSyncUsn' in UserInfo && UserInfo['LastSyncUsn'] > 0) {
                 _init();
             } else {
-                fullSync(function(ok) {
-                    if (!ok) {
-                        Notify.show({ title: 'Info', body: getMsg('Sync error, retry to sync after 3 seconds') });
+                fullSync(function(err, info) {
+                    if (err) {
+                    	if (typeof err == 'object') {
+	                    	if(err['Msg'] == 'NOTLOGIN') {
+	                    		alert(getMsg('You need to sign in Leanote'));
+	                    		toLogin();
+	                    		return;
+							}
+							if(err['Msg'] == 'NEED-UPGRADE-ACCOUNT') {
+								alert(getMsg('You need to upgrade Leanote account'));
+								openExternal('https://leanote.com/pricing#buy');
+								setTimeout(function () {
+		                    		toLogin();
+								}, 1000);
+								return;
+							}
+                    	}
+
+                    	if (isMac()) {
+	                        Notify.show({ title: 'Info', body: getMsg('Sync error, retry to sync after 3 seconds') });
+                    	} else {
+                    		alert(getMsg('Sync error, retry to sync after 3 seconds'));
+                    	}
                         setTimeout(function() {
                             reloadApp();
                         }, 3000);

diff --git a/public/js/app/tag.js b/public/js/app/tag.js
@@ -220,9 +220,9 @@ TagInput.prototype = {
   // called by Note
   setTags: function(tags) {
   	if(!Array.isArray(tags)) {
-  		return;
+      tags = [];
   	}
-    this.$tags.html('');
+    this.clearTags();
   	for(var i = 0; i < tags.length; ++i) {
   		this._addTag(tags[i]);
   	}

diff --git a/public/js/common.js b/public/js/common.js
@@ -1524,7 +1524,7 @@ function toLogin() {
 	if(isMac()) {
 		ipc.send('openUrl', {html: 'login.html', width: 278, height: 370, show: true, frame: false, resizable: false })
 	} else {
-		ipc.send('openUrl', { width: 278, height: 400, show: true, frame: true, resizable: false })
+		ipc.send('openUrl', {html: 'login.html',  width: 278, height: 400, show: true, frame: true, resizable: false })
 	}
 	// gui.getCurrentWindow().close();
 }