DVF-2506-nodejs-integration

Author: blackart

src/acgraph.js

@@ -536,7 +536,6 @@ acgraph.updateReferences = function() {
 
 //exports
 goog.exportSymbol('acgraph.create', acgraph.create);
-goog.exportSymbol('acgraph.getRenderer', acgraph.getRenderer);
 goog.exportSymbol('acgraph.type', acgraph.type);
 goog.exportSymbol('acgraph.server', acgraph.server);
 goog.exportSymbol('acgraph.StageType.SVG', acgraph.StageType.SVG);

src/vector/Defs.js

@@ -303,6 +303,10 @@ acgraph.vector.Defs.prototype.disposeInternal = function() {
   acgraph.getRenderer().removeNode(this.domElement_);
   this.domElement_ = null;
 
-  this.linearGradients_ = null;
+  goog.disposeAll(this.linearGradients_);
+  goog.disposeAll(this.radialGradients_);
+  goog.disposeAll(this.imageFills_);
+  // goog.disposeAll(this.hatchFills_);
+
   delete this.stage;
 };

src/vector/HatchFill.js

@@ -605,9 +605,10 @@ acgraph.vector.HatchFill.prototype.getElementTypePrefix = function() {
 //----------------------------------------------------------------------------------------------------------------------
 /** @inheritDoc */
 acgraph.vector.HatchFill.prototype.disposeInternal = function() {
+  goog.base(this, 'disposeInternal');
+
   if (this.getStage())
     this.getStage().getDefs().removeHatchFill(this);
-  goog.base(this, 'disposeInternal');
 };
 
 

src/vector/Renderer.js

@@ -561,7 +561,7 @@ acgraph.vector.Renderer.prototype.isImageLoading = function() {
  */
 acgraph.vector.Renderer.prototype.getImageLoader = function() {
   if (!this.imageLoader_)
-    this.imageLoader_ = new goog.net.ImageLoader(/** @type {Element} */(document.body));
+    this.imageLoader_ = new goog.net.ImageLoader(/** @type {Element} */(goog.global['document']['body']));
   return this.imageLoader_;
 };
 

src/vector/Stage.js

@@ -2750,6 +2750,11 @@ acgraph.vector.Stage.prototype.disposeInternal = function() {
   this.domElement_ = null;
   this.container_ = null;
   this.originContainer_ = null;
+
+  if (this.credits_) {
+    this.credits_.dispose();
+    this.credits_ = null;
+  }
 };
 
 

src/vector/svg/Renderer.js

@@ -178,22 +178,6 @@ acgraph.vector.svg.Renderer.prototype.createMeasurement_ = function() {
 
   this.measurementGroupNode_ = this.createLayerElement();
   goog.dom.appendChild(this.measurement_, this.measurementGroupNode_);
-
-
-
-  this.measurement_ex = goog.dom.createDom(goog.dom.TagName.DIV);
-  this.virtualBaseLine_ = goog.dom.createDom(goog.dom.TagName.SPAN);
-  this.measurementText_ex = goog.dom.createDom(goog.dom.TagName.SPAN);
-
-  goog.style.setStyle(this.measurement_ex, {'position': 'absolute', 'visibility': 'hidden', 'left': 0, 'top': 0});
-  goog.style.setStyle(this.measurementText_ex, {'font-size': '0px', 'border': '0 solid'});
-  this.measurementText_ex.innerHTML = 'a';
-  goog.style.setStyle(this.virtualBaseLine_, {'font-size': '0px', 'border': '0 solid'});
-  this.virtualBaseLine_.innerHTML = 'a';
-
-  goog.dom.appendChild(document.body, this.measurement_ex);
-  goog.dom.appendChild(this.measurement_ex, this.virtualBaseLine_);
-  goog.dom.appendChild(this.measurement_ex, this.measurementText_ex);
 };
 
 
@@ -260,60 +244,10 @@ acgraph.vector.svg.Renderer.prototype.measure = function(text, style) {
     bbox.height = this.measurementText_['getBBox']().height;
   }
 
-  // var bbox_html = this.measuringHTMLText(text, style);
-  // console.log(bbox_html);
-  // console.log(bbox);
-
-  // return bbox_html;
   return new acgraph.math.Rect(bbox.x, bbox.y, bbox.width + additionWidth, bbox.height);
 };
 
 
-/**
- * Measure simple text.
- * @param {string} text The text to measure.
- * @param {Object} style The style of text.
- * @return {acgraph.math.Rect} Text bounds.
- */
-acgraph.vector.svg.Renderer.prototype.measuringHTMLText = function(text, style) {
-  this.measurementText_ex.style.cssText = '';
-
-  if (style['fontStyle']) goog.style.setStyle(this.measurementText_ex, 'font-style', style['fontStyle']);
-  if (style['fontVariant']) goog.style.setStyle(this.measurementText_ex, 'font-variant', style['fontVariant']);
-  if (style['fontFamily']) goog.style.setStyle(this.measurementText_ex, 'font-family', style['fontFamily']);
-  if (style['fontSize']) goog.style.setStyle(this.measurementText_ex, 'font-size', style['fontSize']);
-  if (style['fontWeight']) goog.style.setStyle(this.measurementText_ex, 'font-weight', style['fontWeight']);
-  if (style['letterSpacing']) goog.style.setStyle(this.measurementText_ex, 'letter-spacing', style['letterSpacing']);
-  if (style['decoration']) goog.style.setStyle(this.measurementText_ex, 'text-decoration', style['decoration']);
-  if (style['textIndent']) goog.style.setStyle(this.measurementText_ex, 'text-indent', style['textIndent']);
-
-  if (style['textWrap'] && style['width'] && style['textWrap'] == acgraph.vector.Text.TextWrap.BY_LETTER) {
-    goog.style.setStyle(this.measurementText_ex, 'word-break', 'break-all');
-  } else {
-    goog.style.setStyle(this.measurementText_ex, 'white-space', 'nowrap');
-  }
-  if (style['width']) goog.style.setStyle(this.measurementText_ex, 'width', style['width']);
-
-  goog.style.setStyle(this.measurement_ex, {'left': 0, 'top': 0, 'width': 'auto', 'height': 'auto'});
-  // goog.style.setStyle(this.measurementText_ex, {
-  //   'border': '0 solid',
-  //   'position': 'absolute',
-  //   'left': 0,
-  //   'top': 0
-  // });
-
-  this.measurementText_ex.innerHTML = text;
-
-  var boundsMicroText = goog.style.getBounds(this.virtualBaseLine_);
-  goog.style.setPosition(this.measurement_ex, 0, -(boundsMicroText.top + boundsMicroText.height));
-
-  var boundsTargetText = goog.style.getBounds(this.measurementText_ex);
-  this.measurementText_ex.innerHTML = '';
-
-  return boundsTargetText;
-};
-
-
 /**
  * Measure any svg nodes.
  * @param {string|Node} element .
@@ -1512,7 +1446,3 @@ acgraph.vector.svg.Renderer.prototype.setPrintAttributes = function(element, sta
   goog.style.setStyle(element, 'height', '');
   goog.style.setStyle(element, 'max-height', '100%');
 };
-
-
-//exports
-acgraph.vector.svg.Renderer.prototype['measuringHTMLText'] = acgraph.vector.svg.Renderer.prototype.measuringHTMLText;