Merge remote-tracking branch 'origin/master'

Author: NogsMPLS

app/components/Playground/editor.js

@@ -13,6 +13,14 @@ function camelize(str) {
   });
 }
 
+function isCommentFold(line) {
+  var isAFold = false;
+  if (/^\s*(\/\*|\/\/)#?region\b/.test(line)) { isAFold = true; }
+  if (/\/\/(.*)\{/.test(line)) { isAFold = true; }
+  if(/^\s*(\/\*\*\*).*\*\/\s*$/.test(line)) { isAFold = true; }
+  return isAFold;
+}
+
 const Editor = React.createClass({
   propTypes: {
     theme: React.PropTypes.string,
@@ -38,7 +46,7 @@ const Editor = React.createClass({
           if (foldWidgets[row] == null)
               foldWidgets[row] = this.getFoldWidget(row);
           if (foldWidgets[row] != "start") continue;
-          if (!/#region/.test(this.getLine(row))) continue
+          if (!isCommentFold(this.getLine(row))) continue
           var range = this.getFoldWidgetRange(row);
           // sometimes range can be incompatible with existing fold
           // TODO change addFold to return null istead of throwing
@@ -50,13 +58,10 @@ const Editor = React.createClass({
               try {
                   // addFold can change the range
                   var fold = this.addFold("...", range);
-                  if (fold)
-                      fold.collapseChildren = depth;
               } catch(e) {}
           }
       }
     };
-    console.log(this.refs.ace.editor.session);
    this.refs.ace.editor.session.foldRegion();
   },
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-component-styleguide",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "publishConfig": {
     "registry": "http://registry.npmjs.org/"
   },
@@ -119,4 +119,4 @@
     "standard": "^6.0.8",
     "uglify-js": "^2.6.2"
   }
-}
+}