Merge remote-tracking branch 'origin/develop'

Author: grasshoppergn

src/acgraph.js

@@ -16,6 +16,7 @@ goog.require('acgraph.vector.Path');
 goog.require('acgraph.vector.PatternFill');
 goog.require('acgraph.vector.Rect');
 goog.require('acgraph.vector.Renderer');
+goog.require('acgraph.vector.SimpleText');
 goog.require('acgraph.vector.Text');
 goog.require('acgraph.vector.UnmanagedLayer');
 goog.require('acgraph.vector.primitives');
@@ -401,6 +402,20 @@ acgraph.text = function(opt_x, opt_y, opt_text, opt_style) {
 };
 
 
+/**
+ Creates, depending on the technology used, an instance of the {@link acgraph.vector.SimpleText} class.<br/>
+ <strong>Important:</strong> When an element is created this way, a parent element is not assigned to it automatically,
+ so it is necessary to set the parent element manually.
+ @param {string=} opt_text The text to display.
+ @return {!acgraph.vector.SimpleText} An instance of the {@link acgraph.vector.SimpleText} class.
+ */
+acgraph.simpleText = function(opt_text) {
+  var text = new acgraph.vector.SimpleText();
+  if (opt_text) text.text(opt_text);
+  return text;
+};
+
+
 /**
  Creates an instance of the{@link acgraph.vector.HatchFill} class in case a fill with such parameters does not
  exist. If there is already a fill with such parameters, an instance of it is returned.<br/>

src/utils/IdGenerator.js

@@ -38,6 +38,7 @@ acgraph.utils.IdGenerator.ElementTypePrefix = {
   LINEAR_GRADIENT: 'linearGradient',
   RADIAL_GRADIENT: 'radialGradient',
   TEXT: 'text',
+  SIMPLE_TEXT: 'simpleText',
   TEXT_SEGMENT: 'tSegment',
   IMAGE: 'image',
   CLIP: 'clip',

src/vector/Element.js

@@ -1027,11 +1027,12 @@ acgraph.vector.Element.prototype.getTransformationMatrix = function() {
  * This method must be overloaded if you need more than one DOM operation to creat a DOM element.
  * Even if you only want to define which DOM must be used - you need to overload.
  * {@link acgraph.vector.Element#createDomInternal}.
+ * @param {boolean=} opt_force .
  * @protected
  */
-acgraph.vector.Element.prototype.createDom = function() {
+acgraph.vector.Element.prototype.createDom = function(opt_force) {
   var stage = this.getStage();
-  if (stage && stage.acquireDomChange(acgraph.vector.Stage.DomChangeType.ELEMENT_CREATE)) {
+  if (stage && stage.acquireDomChange(acgraph.vector.Stage.DomChangeType.ELEMENT_CREATE) || opt_force) {
     this.domElement_ = this.createDomInternal();
     acgraph.register(this);
     this.clearDirtyState(acgraph.vector.Element.DirtyState.DOM_MISSING);
@@ -1090,13 +1091,21 @@ acgraph.vector.Element.prototype.render = function() {
       this.drag(this.draggable_);
   }
 
+  this.beforeRenderInternal();
+
   this.renderInternal();
 
   this.isRendering_ = false;
   return this;
 };
 
 
+/**
+ * Before render internal hook.
+ */
+acgraph.vector.Element.prototype.beforeRenderInternal = function() {};
+
+
 /**
  * Renders element properties supposing DOM is created.
  * @protected

src/vector/Layer.js

@@ -372,6 +372,24 @@ acgraph.vector.Layer.prototype.text = function(opt_x, opt_y, opt_text, opt_style
 };
 
 
+/**
+ Invokes {@link acgraph.vector.SimpleText} class constructor.<br/>
+ <strong>Note:</strong><br>acgraph.vector.Layer does nothing to delete an object after it is used.
+ You need to take care of used objects yourself.
+ @param {string=} opt_text Text to be displayed.
+ @return {!acgraph.vector.SimpleText} {@link acgraph.vector.SimpleText} instance for method chaining.
+ @this {acgraph.vector.ILayer}
+ */
+acgraph.vector.Layer.prototype.simpleText = function(opt_text) {
+  /** @type {!acgraph.vector.SimpleText} */
+  var text = acgraph.simpleText();
+  if (opt_text) text.text(opt_text);
+  text.parent(this);
+
+  return text;
+};
+
+
 /**
  Invokes {@link acgraph.vector.Text} class constructor and applies {@link acgraph.vector.Text#htmlText} method
  to handle HTML formatting.<br/>

src/vector/PathBase.js

@@ -516,12 +516,12 @@ acgraph.vector.PathBase.prototype.moveToInternal = function(x, y) {
   this.arguments_.push(x, y);
   this.currentPoint_ = this.closePoint_ = [x, y];
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Borders cache is not reset as there is no extension for the time being and borders do not change
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 
@@ -550,13 +550,13 @@ acgraph.vector.PathBase.prototype.lineToInternal = function(x, y, var_args) {
   this.count_[this.count_.length - 1] += i / 2;
   this.currentPoint_ = [x, y];
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Caches are reset
   this.dropBoundsCache();
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 
@@ -591,13 +591,13 @@ acgraph.vector.PathBase.prototype.curveToInternal = function(control1X, control1
   this.count_[this.count_.length - 1] += i / 6;
   this.currentPoint_ = [x, y];
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Caches are reset
   this.dropBoundsCache();
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 
@@ -773,13 +773,13 @@ acgraph.vector.PathBase.prototype.arcToInternal = function(rx, ry, fromAngle, ex
   this.simple_ = false;
   this.currentPoint_ = [ex, ey];
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Caches are reset
   this.dropBoundsCache();
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 
@@ -803,13 +803,13 @@ acgraph.vector.PathBase.prototype.arcToAsCurvesInternal = function(rx, ry, fromA
 
   this.curveToInternal.apply(this, curveParams);
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Caches are reset
   this.dropBoundsCache();
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 
@@ -1045,6 +1045,23 @@ acgraph.vector.PathBase.boundsCalculationMap_ = (function() {
 //  Serialize
 //
 //----------------------------------------------------------------------------------------------------------------------
+/**
+ * Serialize only path arguments. For copy path data purposes.
+ * @param  {Object=} opt_data .
+ * @return {Object}
+ */
+acgraph.vector.PathBase.prototype.serializePathArgs = function(opt_data) {
+  var data = opt_data || {};
+  data['closePoint'] = this.closePoint_ ? this.closePoint_.slice() : [];
+  data['currentPoint'] = this.currentPoint_ ? this.currentPoint_.slice() : [];
+  data['segments'] = this.segments_.slice();
+  data['count'] = this.count_.slice();
+  data['arguments'] = this.arguments_.slice();
+
+  return data;
+};
+
+
 /** @inheritDoc */
 acgraph.vector.PathBase.prototype.deserialize = function(data) {
   this.closePoint_ = data['closePoint'];
@@ -1061,11 +1078,7 @@ acgraph.vector.PathBase.prototype.deserialize = function(data) {
 acgraph.vector.PathBase.prototype.serialize = function() {
   var data = goog.base(this, 'serialize');
   data['type'] = 'path';
-  data['closePoint'] = this.closePoint_ ? this.closePoint_.slice() : [];
-  data['currentPoint'] = this.currentPoint_ ? this.currentPoint_.slice() : [];
-  data['segments'] = this.segments_.slice();
-  data['count'] = this.count_.slice();
-  data['arguments'] = this.arguments_.slice();
+  data = this.serializePathArgs(data);
   return data;
 };
 

src/vector/Renderer.js

@@ -68,9 +68,8 @@ acgraph.vector.Renderer.prototype.getEmptyStringBounds = function(style) {
  * Returns simple hash of a passed style object.
  * @param {Object} value Style object.
  * @return {string} Hash of a style object.
- * @private
  */
-acgraph.vector.Renderer.prototype.getStyleHash_ = function(value) {
+acgraph.vector.Renderer.prototype.getStyleHash = function(value) {
   var hash = '';
   for (var j = 0, l = this.settingsAffectingSize.length; j < l; j++) {
     var prop = value[this.settingsAffectingSize[j]];
@@ -92,7 +91,7 @@ acgraph.vector.Renderer.prototype.getStyleHash_ = function(value) {
  */
 acgraph.vector.Renderer.prototype.textBounds = function(text, style, opt_bounds) {
   var boundsCache = this.textBoundsCache;
-  var styleHash = this.getStyleHash_(style);
+  var styleHash = this.getStyleHash(style);
   var styleCache = boundsCache[styleHash];
   if (!styleCache) styleCache = boundsCache[styleHash] = {};
   var textBoundsCache = styleCache[text];
@@ -103,6 +102,18 @@ acgraph.vector.Renderer.prototype.textBounds = function(text, style, opt_bounds)
 };
 
 
+/**
+ * Measure DOM text element.
+ * @param {Element} element .
+ * @param {string} text .
+ * @param {Object} style .
+ * @return {goog.math.Rect} .
+ */
+acgraph.vector.Renderer.prototype.getBBox = function(element, text, style) {
+  return this.textBounds(text, style);
+};
+
+
 /**
  * Whether the cache contains bounds of passed text and style.
  * @param {string} text .
@@ -111,7 +122,7 @@ acgraph.vector.Renderer.prototype.textBounds = function(text, style, opt_bounds)
  */
 acgraph.vector.Renderer.prototype.isInBoundsCache = function(text, style) {
   var boundsCache = this.textBoundsCache;
-  var styleHash = this.getStyleHash_(style);
+  var styleHash = this.getStyleHash(style);
   var styleCache = boundsCache[styleHash];
 
   return !!(styleCache && styleCache[text]);

src/vector/Shape.js

@@ -145,14 +145,18 @@ acgraph.vector.Shape.prototype.strokeThickness = function(opt_value) {
 //
 //----------------------------------------------------------------------------------------------------------------------
 /** @inheritDoc */
-acgraph.vector.Shape.prototype.renderInternal = function() {
+acgraph.vector.Shape.prototype.beforeRenderInternal = function() {
   if (this.boundsAffectedColors_ && this.hasDirtyState(acgraph.vector.Element.DirtyState.DATA)) {
     if (!!(this.boundsAffectedColors_ & 1))
       this.setDirtyState(acgraph.vector.Element.DirtyState.FILL);
     if (!!(this.boundsAffectedColors_ & 2))
       this.setDirtyState(acgraph.vector.Element.DirtyState.STROKE);
   }
+};
+
 
+/** @inheritDoc */
+acgraph.vector.Shape.prototype.renderInternal = function() {
   goog.base(this, 'renderInternal');
 
   // Apply stroke and fill settings if they were changed