Skip to content

Commit 41293cd

Browse files
committed
Merge branch 'develop' of github.com:AnyChart/graphicsjs into develop
2 parents aa3af83 + 9976c5c commit 41293cd

File tree

13 files changed

+29
-21
lines changed

13 files changed

+29
-21
lines changed

build.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
# =======================================================================================================================
1616
# Project paths
1717
# =======================================================================================================================
18-
COMPILER_VERSION = '20161024'
18+
# COMPILER_VERSION = '20161024'
19+
COMPILER_VERSION = '20180204'
1920
PROJECT_PATH = os.path.abspath(os.path.dirname(__file__))
2021
CONTRIB_PATH = os.path.join(PROJECT_PATH, 'contrib')
2122
COMPILER_PATH = os.path.join(CONTRIB_PATH, 'compiler', 'closure-compiler-v%s.jar' % COMPILER_VERSION)

contrib/closure-library

Submodule closure-library updated 1597 files

src/exporting.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ acgraph.vector.Stage.prototype.normalizeImageSize_ = function(opt_width, opt_hei
8989
* @param {function(string)} onSuccess Function that will be called on success.
9090
* @param {function(string)=} opt_onError Function that will be called on error.
9191
* @private
92+
* @suppress {deprecated}
93+
* @todo (Anton Saukh): refactor this deprecation.
9294
*/
9395
acgraph.vector.Stage.prototype.shareUrl_ = function(type, data, asBase64, saveAndShare, onSuccess, opt_onError) {
9496
if (asBase64)

src/vector/Clip.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
goog.provide('acgraph.vector.Clip');
2+
goog.require('acgraph.vector.Circle');
23
goog.require('acgraph.vector.ILayer');
4+
goog.require('acgraph.vector.Path');
5+
goog.require('acgraph.vector.Rect');
36
goog.require('goog.Disposable');
47
goog.require('goog.array');
58
goog.require('goog.math.Rect');

src/vector/Element.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@ acgraph.vector.Element.prototype.render = function() {
10461046
this.renderInternal();
10471047

10481048
this.isRendering_ = false;
1049+
10491050
return this;
10501051
};
10511052

src/vector/HatchFill.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ acgraph.vector.HatchFill = function(opt_type, opt_color, opt_thickness, opt_size
3333
* Hatch fill color.
3434
* @type {string}
3535
*/
36-
this.color = '' + (goog.isDefAndNotNull(opt_color) ? opt_color : 'black 0.5');
36+
this.color = String(goog.isDefAndNotNull(opt_color) ? opt_color : 'black 0.5');
3737
/**
3838
* Hatch fill stroke thickness.
3939
* @type {number}

src/vector/LinearGradient.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ acgraph.vector.LinearGradient.serialize = function(keys, opt_opacity, opt_angle,
117117
/** @type {Array.<string>} */
118118
var gradientKeys = [];
119119
goog.array.forEach(keys, function(el) {
120-
gradientKeys.push('' + el['offset'] + el['color'] + (el['opacity'] ? el['opacity'] : null)
120+
gradientKeys.push(String(el['offset']) + el['color'] + (el['opacity'] ? el['opacity'] : null)
121121
);
122122
});
123123
/** @type {string} */
124124
var boundsToString = bounds ?
125-
'' + bounds.left + bounds.top + bounds.width + bounds.height :
125+
String(bounds.left) + bounds.top + bounds.width + bounds.height :
126126
'';
127127
var transformationToString = opt_transform ? opt_transform.toString() : '';
128128

src/vector/RadialGradient.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ acgraph.vector.RadialGradient.serialize = function(keys, cx, cy, fx, fy, opt_opa
9393
/** @type {Array.<string>} */
9494
var gradientKeys = [];
9595
goog.array.forEach(keys, function(el) {
96-
gradientKeys.push('' + el['offset'] + el['color'] + (el['opacity'] ? el['opacity'] : 1));
96+
gradientKeys.push(String(el['offset']) + el['color'] + (el['opacity'] ? el['opacity'] : 1));
9797
});
9898
/** @type {string} */
99-
var boundsToString = opt_mode ? '' + opt_mode.left + opt_mode.top + opt_mode.width + opt_mode.height : '';
99+
var boundsToString = opt_mode ? String(opt_mode.left) + opt_mode.top + opt_mode.width + opt_mode.height : '';
100100
var transformationToString = opt_transform ? opt_transform.toString() : '';
101101

102102
return gradientKeys.join('') + opacity + cx + cy + fx + fy + boundsToString + transformationToString;

src/vector/Stage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,10 +2135,10 @@ acgraph.vector.Stage.prototype.handleMouseEvent_ = function(e) {
21352135
this.eventHandler_.unlisten(goog.dom.getDocument(), acgraph.events.EventType.MOUSEUP, this.handleMouseEvent_, false);
21362136
break;
21372137
case acgraph.events.EventType.TOUCHSTART:
2138-
this.eventHandler_.listen(goog.dom.getDocument(), acgraph.events.EventType.TOUCHMOVE, this.handleMouseEvent_, false);
2138+
this.eventHandler_.listen(goog.dom.getDocument(), acgraph.events.EventType.TOUCHMOVE, this.handleMouseEvent_, {capture: false, passive: false});
21392139
break;
21402140
case acgraph.events.EventType.TOUCHEND:
2141-
this.eventHandler_.unlisten(goog.dom.getDocument(), acgraph.events.EventType.TOUCHMOVE, this.handleMouseEvent_, false);
2141+
this.eventHandler_.unlisten(goog.dom.getDocument(), acgraph.events.EventType.TOUCHMOVE, this.handleMouseEvent_, {capture: false, passive: false});
21422142
break;
21432143
case goog.events.EventType.POINTERDOWN:
21442144
this.eventHandler_.listen(goog.dom.getDocument(), goog.events.EventType.POINTERMOVE, this.handleMouseEvent_, false);

src/vector/Text.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1603,7 +1603,7 @@ acgraph.vector.Text.prototype.finalizeTextLine = function() {
16031603
}
16041604

16051605
if (this.path()) {
1606-
this.currentLine_[0].dx = this.align == 'start' ? 0 : this.align == 'middle' ?
1606+
firstSegment.dx = this.align == 'start' ? 0 : this.align == 'middle' ?
16071607
this.path().getLength() / 2 - this.currentLineWidth_ / 2 : this.path().getLength() - this.currentLineWidth_;
16081608
}
16091609

0 commit comments

Comments
 (0)