Some bug fixes on fold manager

Mohsen Azimi · Mohsen Azimi · commit 77fbba20e3ea · 2014-08-26T13:33:12.000-07:00
diff --git a/app/scripts/services/fold-manager.js b/app/scripts/services/fold-manager.js
@@ -15,7 +15,7 @@ function FoldManager(Editor, FoldPointFinder) {
   ** Update buffer with changes from editor
   */
   function refreshBuffer() {
-    _.defaults(buffer, FoldPointFinder.findFolds(Editor.getValue()));
+    _.defaults(FoldPointFinder.findFolds(Editor.getValue()), buffer);
     emitChanges();
   }
 
@@ -47,8 +47,8 @@ function FoldManager(Editor, FoldPointFinder) {
     }
 
     while (keys.length) {
-      if (!current && !current.subFolds) {
-        break;
+      if (!current || !current.subFolds) {
+        return null;
       }
       current = current.subFolds[keys.shift()];
     }
diff --git a/app/scripts/services/foldpoint-finder.js b/app/scripts/services/foldpoint-finder.js
@@ -13,7 +13,7 @@ function FoldPointFinder() {
     var lines = yamlString.split('\n');
 
     // Return up to 3 level
-    return { subFolds: getFolds(lines, 5, 0) };
+    return { subFolds: getFolds(lines, 2, 0) };
   };
 
   /*

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ function FoldManager(Editor, FoldPointFinder) {`
`15`	`15`	`** Update buffer with changes from editor`
`16`	`16`	`*/`
`17`	`17`	`function refreshBuffer() {`
`18`		`- _.defaults(buffer, FoldPointFinder.findFolds(Editor.getValue()));`
	`18`	`+ _.defaults(FoldPointFinder.findFolds(Editor.getValue()), buffer);`
`19`	`19`	`emitChanges();`
`20`	`20`	`}`
`21`	`21`
`@@ -47,8 +47,8 @@ function FoldManager(Editor, FoldPointFinder) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`while (keys.length) {`
`50`		`- if (!current && !current.subFolds) {`
`51`		`- break;`
	`50`	`+ if (!current \|\| !current.subFolds) {`
	`51`	`+ return null;`
`52`	`52`	`}`
`53`	`53`	`current = current.subFolds[keys.shift()];`
`54`	`54`	`}`