Merge pull request #25 from mollwe/master

Fixed functions displayed incorrectly when function definitions exists within function.
mohsen1 · Jul 9, 2015 · 90d922d · 90d922d
2 parents 87ac552 + 2f041ed
commit 90d922d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/dist/json-formatter.css b/dist/json-formatter.css
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.2.7 - 2015-06-05T21:24:58.724Z
+ * Version: 0.3.0 - 2015-07-09T13:22:11.385Z
  * License: MIT
  */
 

diff --git a/dist/json-formatter.js b/dist/json-formatter.js
@@ -1,7 +1,7 @@
 /*!
  * jsonformatter
  * 
- * Version: 0.2.7 - 2015-06-05T21:37:16.993Z
+ * Version: 0.3.0 - 2015-07-09T13:22:11.371Z
  * License: MIT
  */
 
@@ -114,8 +114,8 @@ angular.module('jsonFormatter', ['RecursionHelper'])
 
         // Remove content of the function
         return scope.json.toString()
-          .replace(/\n/g, '')
-          .replace(/\{.+?\}/, '') + '{ ... }';
+          .replace(/[\r\n]/g, '')
+          .replace(/\{.*\}/, '') + '{ ... }';
 
       }
       return value;

diff --git a/dist/json-formatter.min.css b/dist/json-formatter.min.css
diff --git a/dist/json-formatter.min.js b/dist/json-formatter.min.js
diff --git a/src/json-formatter.js b/src/json-formatter.js
@@ -106,8 +106,8 @@ angular.module('jsonFormatter', ['RecursionHelper'])
 
         // Remove content of the function
         return scope.json.toString()
-          .replace(/\n/g, '')
-          .replace(/\{.+?\}/, '') + '{ ... }';
+          .replace(/[\r\n]/g, '')
+          .replace(/\{.*\}/, '') + '{ ... }';
 
       }
       return value;

diff --git a/test/json-formatter.spec.js b/test/json-formatter.spec.js
@@ -17,6 +17,11 @@ describe('json-formatter', function () {
     scope._function = function add(a, b) {
         return a + b;
     };
+    scope.promiseFunction = function getAdd(service, a) {
+        return service.get(a).then(function (b) {
+            return a + b;
+        });
+    };
     scope.string = 'Hello world!';
     scope.date = (new Date(0)).toString(); // begging of Unix time
     scope.url = 'https://example.com';
@@ -68,6 +73,17 @@ describe('json-formatter', function () {
         expect(element.text()).toContain('function');
         expect(element.text()).toContain('add');
         expect(element.text()).toContain('(a, b)');
+        expect(element.text().match(/function\s[^\(]*\([^\)]*\)\s*(.*)/)[1]).toBe('{ ... }');
+      });
+    });
+
+    describe('promiseFunction', function(){
+      it('should render the function', function () {
+        element = createDirective('promiseFunction');
+        expect(element.text()).toContain('function');
+        expect(element.text()).toContain('getAdd');
+        expect(element.text()).toContain('(service, a)');
+        expect(element.text().match(/function\s[^\(]*\([^\)]*\)\s*(.*)/)[1]).toBe('{ ... }');
       });
     });