Merge pull request #502 from lepdou/1226

bugfix: diff directive undifined exception

Merge pull request #502 from lepdou/1226
67efe969 · Jason Song · GitHub · 5b36cc6e · 0a1199f8 · 67efe969
Commit 67efe969 authored Dec 26, 2016 by Jason Song Committed by GitHub Dec 26, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

diff-directive.js ...main/resources/static/scripts/directive/diff-directive.js +4 -1

No files found.
--- a/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js
+++ b/apollo-portal/src/main/resources/static/scripts/directive/diff-directive.js
@@ -29,7 +29,10 @@ directive_module.directive('apollodiff',
                                               span = null,
                                               pre = '';

-                                           var diff = JsDiff.diffLines(scope.oldStr, scope.newStr),
+                                           var oldStr = scope.oldStr == undefined ? '' : scope.oldStr;
+                                           var newStr = scope.newStr == undefined ? '' : scope.newStr;
+
+                                           var diff = JsDiff.diffLines(oldStr, newStr),
                                               fragment = document.createDocumentFragment();

                                           diff.forEach(function (part) {