Release 1.3.4

Author: chidori

dist/graphics.js

@@ -1,7 +1,7 @@
 {
   "name": "graphicsjs",
   "filename": "graphics.min.js",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "A lightweight JavaScript graphics library with the intuitive API, based on SVG/VML technology",
   "repository": {
     "type": "git",

dist/graphics.min.js

@@ -35,11 +35,10 @@ acgraph.WRAPPER_ID_PROP_NAME_ = 'data-ac-wrapper-id';
 
 
 /**
- * Wrappers map.
+ * Public Wrappers map.
  * @type {Object.<string, acgraph.vector.Element|acgraph.vector.Stage>}
- * @private
  */
-acgraph.wrappers_ = {};
+acgraph.wrappers = {};
 
 
 /**
@@ -50,7 +49,7 @@ acgraph.register = function(wrapper) {
   var node = wrapper.domElement();
   if (node) {
     var id = String(goog.getUid(wrapper));
-    acgraph.wrappers_[id] = wrapper;
+    acgraph.wrappers[id] = wrapper;
     node.setAttribute(acgraph.WRAPPER_ID_PROP_NAME_, id);
   }
 };
@@ -61,7 +60,7 @@ acgraph.register = function(wrapper) {
  * @param {acgraph.vector.Element|acgraph.vector.Stage} wrapper
  */
 acgraph.unregister = function(wrapper) {
-  delete acgraph.wrappers_[String(goog.getUid(wrapper))];
+  delete acgraph.wrappers[String(goog.getUid(wrapper))];
   var node = wrapper.domElement();
   if (node)
     node.removeAttribute(acgraph.WRAPPER_ID_PROP_NAME_);
@@ -83,7 +82,7 @@ acgraph.getWrapperForDOM = function(node, stage) {
       break;
     node = /** @type {Element} */(node.parentNode);
   }
-  var res = acgraph.wrappers_[uid || ''] || null;
+  var res = acgraph.wrappers[uid || ''] || null;
   return (res && res.domElement() == node) ? res : null;
 };
 
@@ -533,9 +532,9 @@ acgraph.updateReferences = function() {
   var wrapper;
   var renderer = acgraph.getRenderer();
 
-  for (var id in acgraph.wrappers_) {
-    if (!acgraph.wrappers_.hasOwnProperty(id)) continue;
-    wrapper = acgraph.wrappers_[id];
+  for (var id in acgraph.wrappers) {
+    if (!acgraph.wrappers.hasOwnProperty(id)) continue;
+    wrapper = acgraph.wrappers[id];
     var wrapperStage = wrapper.getStage();
     if (!wrapperStage) continue;
 

package.json

@@ -436,25 +436,36 @@ acgraph.math.fitWithProportion = function(targetWidth, targetHeight, sourceWidth
 //
 //------------------------------------------------------------------------------
 /**
- Getter for the X-coordinate.
- @this {goog.math.Coordinate}
- @return {number} X-coordinate.
+ * Getter for the X-coordinate.
+ * @this {goog.math.Coordinate}
+ * @return {number} X-coordinate.
  */
 goog.math.Coordinate.prototype.getX = function() {
   return this.x;
 };
 
 
 /**
- Getter for the Y-coordinate.
- @this {goog.math.Coordinate}
- @return {number} The Y-coordinate.
+ * Getter for the Y-coordinate.
+ * @this {goog.math.Coordinate}
+ * @return {number} The Y-coordinate.
  */
 goog.math.Coordinate.prototype.getY = function() {
   return this.y;
 };
 
 
+/**
+ * Coordinate constructor method.
+ * @param {number=} opt_x Left, defaults to 0.
+ * @param {number=} opt_y Top, defaults to 0.
+ * @return {goog.math.Coordinate}
+ */
+acgraph.math.coordinate = function(opt_x, opt_y) {
+  return new goog.math.Coordinate(opt_x, opt_y);
+};
+
+
 //endregion
 //region --- Rect
 //------------------------------------------------------------------------------
@@ -522,6 +533,19 @@ goog.math.Rect.prototype.getBottom = function() {
 };
 
 
+/**
+ * Rect constructor method.
+ * @param {number} x Left.
+ * @param {number} y Top.
+ * @param {number} w Width.
+ * @param {number} h Height.
+ * @return {goog.math.Rect}
+ */
+acgraph.math.rect = function(x, y, w, h) {
+  return new goog.math.Rect(x, y, w, h);
+};
+
+
 //endregion
 //region --- Size
 //------------------------------------------------------------------------------
@@ -552,9 +576,10 @@ goog.math.Size.prototype.getHeight = function() {
 //endregion
 //exports
 (function() {
-  goog.exportSymbol('acgraph.math.Coordinate', goog.math.Coordinate);
-  goog.exportSymbol('acgraph.math.Rect', goog.math.Rect);
   goog.exportSymbol('acgraph.math.Size', goog.math.Size);
+  goog.exportSymbol('acgraph.math.coordinate', acgraph.math.coordinate);
+  goog.exportSymbol('acgraph.math.rect', acgraph.math.rect);
+  goog.exportSymbol('acgraph.math.Rect', goog.math.Rect);
   var proto = goog.math.Coordinate.prototype;
   proto['getX'] = proto.getX;
   proto['getY'] = proto.getY;

src/acgraph.js

@@ -768,8 +768,9 @@ acgraph.utils.HTMLParser.prototype.parseText = function(textElem) {
 
         var isNotLetterOrDigit = /(_|\W)/.test(symbol); //Whether current symbol is not letter and not digit.
         if (isNotLetterOrDigit) {
-          var nextState = (symbol == '<') ? s.READ_TAG : s.READ_TEXT;
-          this.finalizeEntity_(nextState, symbol);
+          var openTag = symbol == '<';
+          var nextState = openTag ? s.READ_TAG : s.READ_TEXT;
+          this.finalizeEntity_(nextState, openTag ? '' : symbol);
           break;
         }
 

src/math.js

@@ -15,14 +15,16 @@ goog.require('goog.math.Rect');
 acgraph.vector.Shape = function() {
   /**
    * Fill settings object.
-   * @type {acgraph.vector.Fill}
+   * Null value means that fill will not be rendered.
+   * @type {?acgraph.vector.Fill}
    * @private
    */
   this.fill_ = 'none';
 
   /**
    * Stroke settings object.
-   * @type {acgraph.vector.Stroke}
+   * Null value means that fill will not be rendered.
+   * @type {?acgraph.vector.Stroke}
    * @private
    */
   this.stroke_ = 'black';
@@ -65,7 +67,7 @@ acgraph.vector.Shape.prototype.SUPPORTED_DIRTY_STATES =
  @param {number=} opt_opacity .
  @param {number=} opt_fx .
  @param {number=} opt_fy .
- @return {!(acgraph.vector.Fill|acgraph.vector.Shape)} .
+ @return {(acgraph.vector.Fill|acgraph.vector.Shape|null)} .
  */
 acgraph.vector.Shape.prototype.fill = function(opt_fillOrColorOrKeys, opt_opacityOrAngleOrCx, opt_modeOrCy, opt_opacityOrMode,
     opt_opacity, opt_fx, opt_fy) {
@@ -95,7 +97,7 @@ acgraph.vector.Shape.prototype.fill = function(opt_fillOrColorOrKeys, opt_opacit
   @param {string=} opt_dashpattern .
   @param {acgraph.vector.StrokeLineJoin=} opt_lineJoin .
   @param {acgraph.vector.StrokeLineCap=} opt_lineCap .
-  @return {(!acgraph.vector.Shape|acgraph.vector.Stroke)} .
+  @return {(acgraph.vector.Shape|acgraph.vector.Stroke|null)} .
  */
 acgraph.vector.Shape.prototype.stroke = function(opt_strokeOrFill, opt_thickness, opt_dashpattern, opt_lineJoin, opt_lineCap) {
   if (!goog.isDef(opt_strokeOrFill))
@@ -113,6 +115,19 @@ acgraph.vector.Shape.prototype.stroke = function(opt_strokeOrFill, opt_thickness
 };
 
 
+/**
+ * Adds possibility to nullify fill and stroke for alternative coloring
+ * like text color since text becomes the shape (DVF-3872).
+ * Null value prevents fill/stroke attribute rendering.
+ *
+ * DEV NOTE: Do not abuse this method because it sets no dirty state.
+ */
+acgraph.vector.Shape.prototype.setNullFillAndStroke = function() {
+  this.fill_ = null;
+  this.stroke_ = null;
+};
+
+
 /**
   Gets/sets stroke thickness.
   @param {number=} opt_value Thickness value.

src/utils/HTMLParser.js

@@ -2197,7 +2197,8 @@ acgraph.vector.Stage.prototype.disposeInternal = function() {
   delete this.internalContainer_;
   this.domElement_ = null;
 
-  acgraph.getRenderer().disposeMeasurement();
+  if (goog.object.isEmpty(acgraph.wrappers))
+    acgraph.getRenderer().disposeMeasurement();
 
   if (this.credits_) {
     this.credits_.dispose();

src/vector/Shape.js

@@ -3,7 +3,7 @@ goog.provide('acgraph.vector.Text.TextOverflow');
 
 goog.require('acgraph.utils.HTMLParser');
 goog.require('acgraph.utils.IdGenerator');
-goog.require('acgraph.vector.Element');
+goog.require('acgraph.vector.Shape');
 goog.require('acgraph.vector.TextSegment');
 goog.require('goog.math.Rect');
 
@@ -21,7 +21,7 @@ goog.require('goog.math.Rect');
  @param {number=} opt_x Coordinate X (Left) of left top corner of text bounds.
  @param {number=} opt_y Coordinate Y (Top) of left top corner of text bounds.
  @constructor
- @extends {acgraph.vector.Element}
+ @extends {acgraph.vector.Shape}
 */
 acgraph.vector.Text = function(opt_x, opt_y) {
 
@@ -218,8 +218,9 @@ acgraph.vector.Text = function(opt_x, opt_y) {
   this.textPath = null;
 
   goog.base(this);
+  this.setNullFillAndStroke();
 };
-goog.inherits(acgraph.vector.Text, acgraph.vector.Element);
+goog.inherits(acgraph.vector.Text, acgraph.vector.Shape);
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -419,7 +420,7 @@ acgraph.vector.Text.Direction = {
  * @type {number}
  */
 acgraph.vector.Text.prototype.SUPPORTED_DIRTY_STATES =
-    acgraph.vector.Element.prototype.SUPPORTED_DIRTY_STATES |
+    acgraph.vector.Shape.prototype.SUPPORTED_DIRTY_STATES |
         acgraph.vector.Element.DirtyState.DATA |
         acgraph.vector.Element.DirtyState.STYLE |
         acgraph.vector.Element.DirtyState.POSITION |
@@ -1690,41 +1691,42 @@ acgraph.vector.Text.prototype.textDefragmentation = function() {
     this.text_ = goog.string.canonicalizeNewlines(goog.string.normalizeSpaces(this.text_));
     var textArr = this.text_.split(q);
 
-    if (textArr.length == 1 && !goog.isDef(this.style_['width']) && !this.path()) {
-      if (!this.domElement()) {
-        this.createDom(true);
-      }
-      if (this.hasDirtyState(acgraph.vector.Element.DirtyState.STYLE))
-        this.renderStyle();
-
-      segment = new acgraph.vector.TextSegment(this.text_, {});
-      this.currentLine_.push(segment);
-      this.segments_.push(segment);
-      segment.parent(this);
-
-      if (this.hasDirtyState(acgraph.vector.Element.DirtyState.DATA))
-        this.renderData();
-
-      var bounds = acgraph.getRenderer().getBBox(this.domElement(), this.text_, this.style_);
-
-      segment.baseLine = -bounds.top;
-      segment.height = bounds.height;
-      segment.width = bounds.width;
-
-      // calculate line params with newly added segment.
-      this.currentLineHeight_ = bounds.height;
-      this.currentLineWidth_ = bounds.width + this.textIndent_;
-      this.currentBaseLine_ = segment.baseLine;
-      this.currentLineEmpty_ = this.text_.length == 0;
-
-      this.finalizeTextLine();
-      this.currentNumberSeqBreaks_++;
-      var height = this.currentLine_[0] ? this.currentLine_[0].height : 0;
-      this.accumulatedHeight_ += goog.isString(this.lineHeight_) ?
-          parseInt(this.lineHeight_, 0) + height :
-          this.lineHeight_ * height;
-
-    } else {
+    // if (textArr.length == 1 && !goog.isDefAndNotNull(this.style_['width']) && !this.path()) {
+    //   if (!this.domElement()) {
+    //     this.createDom(true);
+    //   }
+    //
+    //   if (this.hasDirtyState(acgraph.vector.Element.DirtyState.STYLE))
+    //     this.renderStyle();
+    //
+    //   if (this.hasDirtyState(acgraph.vector.Element.DirtyState.DATA)) {
+    //     segment = new acgraph.vector.TextSegment(this.text_, {});
+    //     this.currentLine_.push(segment);
+    //     this.segments_.push(segment);
+    //     segment.parent(this);
+    //
+    //     this.renderData();
+    //   }
+    //
+    //   var bounds = acgraph.getRenderer().getBBox(this.domElement(), this.text_, this.style_);
+    //
+    //   segment.baseLine = -bounds.top;
+    //   segment.height = bounds.height;
+    //   segment.width = bounds.width;
+    //
+    //   // calculate line params with newly added segment.
+    //   this.currentLineHeight_ = bounds.height;
+    //   this.currentLineWidth_ = bounds.width + this.textIndent_;
+    //   this.currentBaseLine_ = segment.baseLine;
+    //   this.currentLineEmpty_ = this.text_.length == 0;
+    //
+    //   this.finalizeTextLine();
+    //   this.currentNumberSeqBreaks_++;
+    //   var height = this.currentLine_[0] ? this.currentLine_[0].height : 0;
+    //   this.accumulatedHeight_ += goog.isString(this.lineHeight_) ?
+    //       parseInt(this.lineHeight_, 0) + height :
+    //       this.lineHeight_ * height;
+    // } else {
       for (i = 0; i < textArr.length; i++) {
         text = goog.string.trimLeft(textArr[i]);
         if (goog.isDefAndNotNull(text)) {
@@ -1736,7 +1738,7 @@ acgraph.vector.Text.prototype.textDefragmentation = function() {
           }
         }
       }
-    }
+    // }
   }
 
   if (this.textIndent_ && this.textLines_.length > 0) {