Merge branch 'master' into 3.0-features

src/core/PrettyPrinter.js

@@ -3,6 +3,8 @@ getJasmineRequireObj().pp = function(j$) {
   function PrettyPrinter() {
     this.ppNestLevel_ = 0;
     this.seen = [];
+    this.length = 0;
+    this.stringParts = [];
   }
 
   function hasCustomToString(value) {
@@ -88,32 +90,15 @@ getJasmineRequireObj().pp = function(j$) {
     return objKeys.length > length;
   };
 
-  PrettyPrinter.prototype.emitArray = j$.unimplementedMethod_;
-  PrettyPrinter.prototype.emitSet = j$.unimplementedMethod_;
-  PrettyPrinter.prototype.emitMap = j$.unimplementedMethod_;
-  PrettyPrinter.prototype.emitObject = j$.unimplementedMethod_;
-  PrettyPrinter.prototype.emitScalar = j$.unimplementedMethod_;
-  PrettyPrinter.prototype.emitString = j$.unimplementedMethod_;
-  PrettyPrinter.prototype.emitDomElement = j$.unimplementedMethod_;
-
-  function StringPrettyPrinter() {
-    PrettyPrinter.call(this);
-
-    this.length = 0;
-    this.stringParts = [];
-  }
-
-  j$.util.inherit(StringPrettyPrinter, PrettyPrinter);
-
-  StringPrettyPrinter.prototype.emitScalar = function(value) {
+  PrettyPrinter.prototype.emitScalar = function(value) {
     this.append(value);
   };
 
-  StringPrettyPrinter.prototype.emitString = function(value) {
+  PrettyPrinter.prototype.emitString = function(value) {
     this.append('\'' + value + '\'');
   };
 
-  StringPrettyPrinter.prototype.emitArray = function(array) {
+  PrettyPrinter.prototype.emitArray = function(array) {
     if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) {
       this.append('Array');
       return;
@@ -147,7 +132,7 @@ getJasmineRequireObj().pp = function(j$) {
     this.append(' ]');
   };
 
-  StringPrettyPrinter.prototype.emitSet = function(set) {
+  PrettyPrinter.prototype.emitSet = function(set) {
     if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) {
       this.append('Set');
       return;
@@ -167,7 +152,7 @@ getJasmineRequireObj().pp = function(j$) {
     this.append(' )');
   };
 
-  StringPrettyPrinter.prototype.emitMap = function(map) {
+  PrettyPrinter.prototype.emitMap = function(map) {
     if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) {
       this.append('Map');
       return;
@@ -187,7 +172,7 @@ getJasmineRequireObj().pp = function(j$) {
     this.append(' )');
   };
 
-  StringPrettyPrinter.prototype.emitObject = function(obj) {
+  PrettyPrinter.prototype.emitObject = function(obj) {
     var ctor = obj.constructor,
         constructorName;
 
@@ -220,7 +205,7 @@ getJasmineRequireObj().pp = function(j$) {
     this.append(' })');
   };
 
-  StringPrettyPrinter.prototype.emitTypedArray = function(arr) {
+  PrettyPrinter.prototype.emitTypedArray = function(arr) {
     var constructorName = j$.fnNameFor(arr.constructor),
       limitedArray = Array.prototype.slice.call(arr, 0, j$.MAX_PRETTY_PRINT_ARRAY_LENGTH),
       itemsString = Array.prototype.join.call(limitedArray, ', ');
@@ -232,7 +217,7 @@ getJasmineRequireObj().pp = function(j$) {
     this.append(constructorName + ' [ ' + itemsString + ' ]');
   };
 
-  StringPrettyPrinter.prototype.emitDomElement = function(el) {
+  PrettyPrinter.prototype.emitDomElement = function(el) {
     var closingTag = '</' + el.tagName.toLowerCase() + '>';
 
     if (el.innerHTML === '') {
@@ -244,7 +229,7 @@ getJasmineRequireObj().pp = function(j$) {
     }
   };
 
-  StringPrettyPrinter.prototype.formatProperty = function(obj, property, isGetter) {
+  PrettyPrinter.prototype.formatProperty = function(obj, property, isGetter) {
       this.append(property);
       this.append(': ');
       if (isGetter) {
@@ -254,7 +239,7 @@ getJasmineRequireObj().pp = function(j$) {
       }
   };
 
-  StringPrettyPrinter.prototype.append = function(value) {
+  PrettyPrinter.prototype.append = function(value) {
     var result = truncate(value, j$.MAX_PRETTY_PRINT_CHARS - this.length);
     this.length += result.value.length;
     this.stringParts.push(result.value);
@@ -264,6 +249,7 @@ getJasmineRequireObj().pp = function(j$) {
     }
   };
 
+
   function truncate(s, maxlen) {
     if (s.length <= maxlen) {
       return { value: s, truncated: false };
@@ -310,8 +296,8 @@ getJasmineRequireObj().pp = function(j$) {
     return extraKeys;
   }
   return function(value) {
-    var stringPrettyPrinter = new StringPrettyPrinter();
-    stringPrettyPrinter.format(value);
-    return stringPrettyPrinter.stringParts.join('');
+    var prettyPrinter = new PrettyPrinter();
+    prettyPrinter.format(value);
+    return prettyPrinter.stringParts.join('');
   };
 };