bugfixes

shatting · Apr 26, 2011 · f779923 · f779923
1 parent 8032a4e
commit f779923
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/javascripts/background.js b/javascripts/background.js
@@ -101,6 +101,7 @@ function handleRequest(request, sender, sendResponse) {
     if (!SimplenoteDB.hadSync() && request.action != "login") {
 
         log("handleRequest:starting initial sync.");
+        SimplenoteDB.reset();
         backgroundSync(true, function() {
             log("handleRequest:initial sync done.");
             handleRequest(request, sender, sendResponse);

diff --git a/javascripts/common.js b/javascripts/common.js
@@ -3,7 +3,7 @@
 // ------------------------------------------------------------------------------------------------
 
 // global debug switch
-var commonDebug = true;
+var commonDebug = false;
 
 function logGeneral(s,prefix,target) {
     if (!commonDebug)

diff --git a/javascripts/popup.js b/javascripts/popup.js
@@ -67,9 +67,12 @@ chrome.extension.onRequest.addListener(function (eventData, sender, sendResponse
         fillTags(true);
     } else if (eventData.name == "noteupdated") {
         log("EventListener:" + eventData.name);
-        if (eventData.changes.changed.indexOf("deleted")>=0)
+        if (eventData.changes.changed.indexOf("deleted")>=0) {
             $('div.noterow#' + eventData.newnote.key).hide()
-        else {
+            fillTags(false);
+        } else if (eventData.changes.changed.indexOf("systemtags")>=0 || eventData.changes.changed.indexOf("modifydate")>=0) {
+            fillTags(true);
+        } else {
             indexAddNote("replace", eventData.newnote);
             indexFillNote(eventData.newnote);
         }
@@ -297,7 +300,7 @@ function indexAddNote(mode, note){
                 shareds.push(tag);                
             }
         });
-        if (note.sharekey != undefined)
+        if (shareds.length > 0)
             html+= "<div class='shared' id='" + note.key + "shared' title='Shared with " + shareds.join(", ") + "'>&nbsp;</div>";
     }
     html+=          "<div class='noteheading' id='" + note.key + "heading'>";    
@@ -831,7 +834,7 @@ function editorNoteChanged(key) {
     else if (key != '' ) {                  // existing note, new data -> update
         noteData.key = key;
         noteData.action = "update";
-    } else if (noteData.content != '')          // new note, new data -> create
+    } else if (noteData.content && noteData.content != '')          // new note, new data -> create
         noteData.action = "create";
 
     slideIndex();

diff --git a/javascripts/simplenoteDB.js b/javascripts/simplenoteDB.js
@@ -30,6 +30,14 @@ var SimplenoteDB = {
         }              
     },
 
+    reset : function() {
+        this.isSyncInProgress = false;
+        this.syncCallbackChunk = undefined;
+        this.syncCallbackFinished = undefined;
+        delete this._indexKeysTemp;
+        delete this._indexKeysChanged;
+    },
+
     isSyncInProgress : false,
 
     // jsut to detect whether we actually had a sync
@@ -161,6 +169,8 @@ var SimplenoteDB = {
                 this.log("_gotIndexChunk: changed " + this._indexKeysChanged.changed.length);
             if (this._indexKeysChanged.deleted.length > 0)
                 this.log("_gotIndexChunk: deleted " + this._indexKeysChanged.deleted.length);
+
+            delete this._indexKeysChanged;
         }
     },
 

diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Simplenote+",
-  "version": "1.4.7",
+  "version": "1.4.7.1",
   "description": "Access your Simplenote notes right from your chrome extension bar.",  
   "icons": {
     "96": "imanges/logo_96.png",