block-scoped-var fix
diff --git a/.eslintrc.json b/.eslintrc.json
index 3a79437..0703ffd 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -41,7 +41,6 @@
"strict": "off",
"lines-around-directive": "off",
"no-useless-escape": "off",
- "block-scoped-var": "off",
"no-shadow": "off",
"no-restricted-globals": "off",
"default-case": "off",
diff --git a/player/js/elements/canvasElements/CVShapeElement.js b/player/js/elements/canvasElements/CVShapeElement.js
index 9f66720..5d38915 100644
--- a/player/js/elements/canvasElements/CVShapeElement.js
+++ b/player/js/elements/canvasElements/CVShapeElement.js
@@ -394,9 +394,9 @@
CVShapeElement.prototype.renderGradientFill = function (styleData, itemData, groupTransform) {
var styleElem = itemData.style;
+ var grd;
if (!styleElem.grd || itemData.g._mdf || itemData.s._mdf || itemData.e._mdf || (styleData.t !== 1 && (itemData.h._mdf || itemData.a._mdf))) {
var ctx = this.globalData.canvasContext;
- var grd;
var pt1 = itemData.s.v, pt2 = itemData.e.v;
if (styleData.t === 1) {
grd = ctx.createLinearGradient(pt1[0], pt1[1], pt2[0], pt2[1]);
@@ -408,7 +408,7 @@
var dist = rad * percent;
var x = Math.cos(ang + itemData.a.v) * dist + pt1[0];
var y = Math.sin(ang + itemData.a.v) * dist + pt1[1];
- var grd = ctx.createRadialGradient(x, y, 0, pt1[0], pt1[1], rad);
+ grd = ctx.createRadialGradient(x, y, 0, pt1[0], pt1[1], rad);
}
var i, len = styleData.g.p;
diff --git a/player/js/module.js b/player/js/module.js
index c1bacbe..69573c8 100644
--- a/player/js/module.js
+++ b/player/js/module.js
@@ -120,13 +120,14 @@
var standalone = '__[STANDALONE]__';
var animationData = '__[ANIMATIONDATA]__';
var renderer = '';
+var queryString;
if (standalone) {
var scripts = document.getElementsByTagName('script');
var index = scripts.length - 1;
var myScript = scripts[index] || {
src: '',
};
- var queryString = myScript.src.replace(/^[^\?]+\??/, '');
+ queryString = myScript.src.replace(/^[^\?]+\??/, '');
renderer = getQueryVariable('renderer');
}
var readyStateCheckInterval = setInterval(checkReady, 100);
diff --git a/player/js/utils/TransformProperty.js b/player/js/utils/TransformProperty.js
index 674efe0..39a48d9 100644
--- a/player/js/utils/TransformProperty.js
+++ b/player/js/utils/TransformProperty.js
@@ -43,6 +43,7 @@
this.iterateDynamicProperties();
if (this._mdf || forceRender) {
+ var frameRate;
this.v.cloneFromProps(this.pre.props);
if (this.appliedTransformations < 1) {
this.v.translate(-this.a.v[0], -this.a.v[1], this.a.v[2]);
@@ -61,7 +62,8 @@
.rotateX(this.or.v[0]);
}
if (this.autoOriented) {
- var v1, v2, frameRate = this.elem.globalData.frameRate;
+ var v1, v2;
+ frameRate = this.elem.globalData.frameRate;
if (this.p && this.p.keyframes && this.p.getValueAtTime) {
if (this.p._caching.lastFrame + this.p.offsetTime <= this.p.keyframes[0].t) {
v1 = this.p.getValueAtTime((this.p.keyframes[0].t + 0.01) / frameRate, 0);
@@ -76,7 +78,7 @@
} else if (this.px && this.px.keyframes && this.py.keyframes && this.px.getValueAtTime && this.py.getValueAtTime) {
v1 = [];
v2 = [];
- var px = this.px, py = this.py, frameRate;
+ var px = this.px, py = this.py;
if (px._caching.lastFrame + px.offsetTime <= px.keyframes[0].t) {
v1[0] = px.getValueAtTime((px.keyframes[0].t + 0.01) / frameRate, 0);
v1[1] = py.getValueAtTime((py.keyframes[0].t + 0.01) / frameRate, 0);
diff --git a/player/js/utils/expressions/TransformInterface.js b/player/js/utils/expressions/TransformInterface.js
index 12b1b06..b6c5f84 100644
--- a/player/js/utils/expressions/TransformInterface.js
+++ b/player/js/utils/expressions/TransformInterface.js
@@ -60,13 +60,12 @@
Object.defineProperty(_thisFunction, 'scale', {
get: ExpressionPropertyInterface(transform.s),
});
-
+ var _px, _py, _pz, _transformFactory;
if (transform.p) {
- var _transformFactory = ExpressionPropertyInterface(transform.p);
+ _transformFactory = ExpressionPropertyInterface(transform.p);
} else {
- var _px = ExpressionPropertyInterface(transform.px);
- var _py = ExpressionPropertyInterface(transform.py);
- var _pz;
+ _px = ExpressionPropertyInterface(transform.px);
+ _py = ExpressionPropertyInterface(transform.py);
if (transform.pz) {
_pz = ExpressionPropertyInterface(transform.pz);
}
