camelcase fix
diff --git a/.eslintrc.json b/.eslintrc.json
index 403f8d8..eda85de 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -43,7 +43,6 @@
"no-use-before-define": "off",
"strict": "off",
"lines-around-directive": "off",
- "camelcase": "off",
"eqeqeq": "off"
}
}
diff --git a/player/js/elements/canvasElements/CVShapeElement.js b/player/js/elements/canvasElements/CVShapeElement.js
index ac8ce56..f51f345 100644
--- a/player/js/elements/canvasElements/CVShapeElement.js
+++ b/player/js/elements/canvasElements/CVShapeElement.js
@@ -35,7 +35,7 @@
if (data.ty == 'fl' || data.ty == 'st') {
elementData.c = PropertyFactory.getProp(this, data.c, 1, 255, this);
if (!elementData.c.k) {
- styleElem.co = 'rgb(' + bm_floor(elementData.c.v[0]) + ',' + bm_floor(elementData.c.v[1]) + ',' + bm_floor(elementData.c.v[2]) + ')';
+ styleElem.co = 'rgb(' + bmFloor(elementData.c.v[0]) + ',' + bmFloor(elementData.c.v[1]) + ',' + bmFloor(elementData.c.v[2]) + ')';
}
} else if (data.ty === 'gf' || data.ty === 'gs') {
elementData.s = PropertyFactory.getProp(this, data.s, 1, null, this);
@@ -410,9 +410,9 @@
if (itemData.c._mdf || this._isFirstFrame) {
styleElem.co = 'rgb('
- + bm_floor(itemData.c.v[0]) + ','
- + bm_floor(itemData.c.v[1]) + ','
- + bm_floor(itemData.c.v[2]) + ')';
+ + bmFloor(itemData.c.v[0]) + ','
+ + bmFloor(itemData.c.v[1]) + ','
+ + bmFloor(itemData.c.v[2]) + ')';
}
if (itemData.o._mdf || groupTransform._opMdf || this._isFirstFrame) {
styleElem.coOp = itemData.o.v * groupTransform.opacity;
@@ -468,7 +468,7 @@
styleElem.do = d.dashoffset[0];
}
if (itemData.c._mdf || this._isFirstFrame) {
- styleElem.co = 'rgb(' + bm_floor(itemData.c.v[0]) + ',' + bm_floor(itemData.c.v[1]) + ',' + bm_floor(itemData.c.v[2]) + ')';
+ styleElem.co = 'rgb(' + bmFloor(itemData.c.v[0]) + ',' + bmFloor(itemData.c.v[1]) + ',' + bmFloor(itemData.c.v[2]) + ')';
}
if (itemData.o._mdf || groupTransform._opMdf || this._isFirstFrame) {
styleElem.coOp = itemData.o.v * groupTransform.opacity;
diff --git a/player/js/elements/helpers/shapes/SVGElementsRenderer.js b/player/js/elements/helpers/shapes/SVGElementsRenderer.js
index 89d5429..ba6d454 100644
--- a/player/js/elements/helpers/shapes/SVGElementsRenderer.js
+++ b/player/js/elements/helpers/shapes/SVGElementsRenderer.js
@@ -99,7 +99,7 @@
var styleElem = itemData.style;
if (itemData.c._mdf || isFirstFrame) {
- styleElem.pElem.setAttribute('fill', 'rgb(' + bm_floor(itemData.c.v[0]) + ',' + bm_floor(itemData.c.v[1]) + ',' + bm_floor(itemData.c.v[2]) + ')');
+ styleElem.pElem.setAttribute('fill', 'rgb(' + bmFloor(itemData.c.v[0]) + ',' + bmFloor(itemData.c.v[1]) + ',' + bmFloor(itemData.c.v[2]) + ')');
}
if (itemData.o._mdf || isFirstFrame) {
styleElem.pElem.setAttribute('fill-opacity', itemData.o.v);
@@ -213,7 +213,7 @@
styleElem.pElem.setAttribute('stroke-dashoffset', d.dashoffset[0]);
}
if (itemData.c && (itemData.c._mdf || isFirstFrame)) {
- styleElem.pElem.setAttribute('stroke', 'rgb(' + bm_floor(itemData.c.v[0]) + ',' + bm_floor(itemData.c.v[1]) + ',' + bm_floor(itemData.c.v[2]) + ')');
+ styleElem.pElem.setAttribute('stroke', 'rgb(' + bmFloor(itemData.c.v[0]) + ',' + bmFloor(itemData.c.v[1]) + ',' + bmFloor(itemData.c.v[2]) + ')');
}
if (itemData.o._mdf || isFirstFrame) {
styleElem.pElem.setAttribute('stroke-opacity', itemData.o.v);
diff --git a/player/js/elements/htmlElements/HCameraElement.js b/player/js/elements/htmlElements/HCameraElement.js
index 19bea34..52e721a 100644
--- a/player/js/elements/htmlElements/HCameraElement.js
+++ b/player/js/elements/htmlElements/HCameraElement.js
@@ -111,9 +111,9 @@
// var lookDir = getNormalizedPoint(getDiffVector(this.a.v,this.p.v));
var lookDir = [diffVector[0] / mag, diffVector[1] / mag, diffVector[2] / mag];
var lookLengthOnXZ = Math.sqrt(lookDir[2] * lookDir[2] + lookDir[0] * lookDir[0]);
- var m_rotationX = (Math.atan2(lookDir[1], lookLengthOnXZ));
- var m_rotationY = (Math.atan2(lookDir[0], -lookDir[2]));
- this.mat.rotateY(m_rotationY).rotateX(-m_rotationX);
+ var mRotationX = (Math.atan2(lookDir[1], lookLengthOnXZ));
+ var mRotationY = (Math.atan2(lookDir[0], -lookDir[2]));
+ this.mat.rotateY(mRotationY).rotateX(-mRotationX);
}
this.mat.rotateX(-this.rx.v).rotateY(-this.ry.v).rotateZ(this.rz.v);
this.mat.rotateX(-this.or.v[0]).rotateY(-this.or.v[1]).rotateZ(this.or.v[2]);
diff --git a/player/js/elements/htmlElements/HShapeElement.js b/player/js/elements/htmlElements/HShapeElement.js
index 3b9ce86..537f909 100644
--- a/player/js/elements/htmlElements/HShapeElement.js
+++ b/player/js/elements/htmlElements/HShapeElement.js
@@ -89,10 +89,10 @@
HShapeElement.prototype.checkBounds = function (vPoint, oPoint, nextIPoint, nextVPoint, boundingBox) {
this.getBoundsOfCurve(vPoint, oPoint, nextIPoint, nextVPoint);
var bounds = this.shapeBoundingBox;
- boundingBox.x = bm_min(bounds.left, boundingBox.x);
- boundingBox.xMax = bm_max(bounds.right, boundingBox.xMax);
- boundingBox.y = bm_min(bounds.top, boundingBox.y);
- boundingBox.yMax = bm_max(bounds.bottom, boundingBox.yMax);
+ boundingBox.x = bmMin(bounds.left, boundingBox.x);
+ boundingBox.xMax = bmMax(bounds.right, boundingBox.xMax);
+ boundingBox.y = bmMin(bounds.top, boundingBox.y);
+ boundingBox.yMax = bmMax(bounds.bottom, boundingBox.yMax);
};
HShapeElement.prototype.shapeBoundingBox = {
@@ -135,25 +135,25 @@
b2ac = b * b - 4 * c * a;
if (b2ac >= 0) {
- t1 = (-b + bm_sqrt(b2ac)) / (2 * a);
+ t1 = (-b + bmSqrt(b2ac)) / (2 * a);
if (t1 > 0 && t1 < 1) bounds[i].push(this.calculateF(t1, p0, p1, p2, p3, i));
- t2 = (-b - bm_sqrt(b2ac)) / (2 * a);
+ t2 = (-b - bmSqrt(b2ac)) / (2 * a);
if (t2 > 0 && t2 < 1) bounds[i].push(this.calculateF(t2, p0, p1, p2, p3, i));
}
}
}
- this.shapeBoundingBox.left = bm_min.apply(null, bounds[0]);
- this.shapeBoundingBox.top = bm_min.apply(null, bounds[1]);
- this.shapeBoundingBox.right = bm_max.apply(null, bounds[0]);
- this.shapeBoundingBox.bottom = bm_max.apply(null, bounds[1]);
+ this.shapeBoundingBox.left = bmMin.apply(null, bounds[0]);
+ this.shapeBoundingBox.top = bmMin.apply(null, bounds[1]);
+ this.shapeBoundingBox.right = bmMax.apply(null, bounds[0]);
+ this.shapeBoundingBox.bottom = bmMax.apply(null, bounds[1]);
};
HShapeElement.prototype.calculateF = function (t, p0, p1, p2, p3, i) {
- return bm_pow(1 - t, 3) * p0[i]
- + 3 * bm_pow(1 - t, 2) * t * p1[i]
- + 3 * (1 - t) * bm_pow(t, 2) * p2[i]
- + bm_pow(t, 3) * p3[i];
+ return bmPow(1 - t, 3) * p0[i]
+ + 3 * bmPow(1 - t, 2) * t * p1[i]
+ + 3 * (1 - t) * bmPow(t, 2) * p2[i]
+ + bmPow(t, 3) * p3[i];
};
HShapeElement.prototype.calculateBoundingBox = function (itemsData, boundingBox) {
diff --git a/player/js/elements/svgElements/effects/SVGStrokeEffect.js b/player/js/elements/svgElements/effects/SVGStrokeEffect.js
index 6f6c5e0..774c83f 100644
--- a/player/js/elements/svgElements/effects/SVGStrokeEffect.js
+++ b/player/js/elements/svgElements/effects/SVGStrokeEffect.js
@@ -104,7 +104,7 @@
if (this.filterManager.effectElements[10].p.v === 1 || this.filterManager.effectElements[10].p.v === 2) {
if (forceRender || this.filterManager.effectElements[3].p._mdf) {
var color = this.filterManager.effectElements[3].p.v;
- this.pathMasker.setAttribute('stroke', 'rgb(' + bm_floor(color[0] * 255) + ',' + bm_floor(color[1] * 255) + ',' + bm_floor(color[2] * 255) + ')');
+ this.pathMasker.setAttribute('stroke', 'rgb(' + bmFloor(color[0] * 255) + ',' + bmFloor(color[1] * 255) + ',' + bmFloor(color[2] * 255) + ')');
}
}
};
diff --git a/player/js/utils/PropertyFactory.js b/player/js/utils/PropertyFactory.js
index 314b9fc..df878a3 100644
--- a/player/js/utils/PropertyFactory.js
+++ b/player/js/utils/PropertyFactory.js
@@ -1,6 +1,6 @@
var PropertyFactory = (function () {
var initFrame = initialDefaultFrame;
- var math_abs = Math.abs;
+ var mathAbs = Math.abs;
function interpolateValue(frameNum, caching) {
var offsetTime = this.offsetTime;
@@ -268,7 +268,7 @@
var multipliedValue;
if (this.propType === 'unidimensional') {
multipliedValue = val * this.mult;
- if (math_abs(this.v - multipliedValue) > 0.00001) {
+ if (mathAbs(this.v - multipliedValue) > 0.00001) {
this.v = multipliedValue;
this._mdf = true;
}
@@ -277,7 +277,7 @@
len = this.v.length;
while (i < len) {
multipliedValue = val[i] * this.mult;
- if (math_abs(this.v[i] - multipliedValue) > 0.00001) {
+ if (mathAbs(this.v[i] - multipliedValue) > 0.00001) {
this.v[i] = multipliedValue;
this._mdf = true;
}
diff --git a/player/js/utils/bez.js b/player/js/utils/bez.js
index 55a9694..0f12617 100644
--- a/player/js/utils/bez.js
+++ b/player/js/utils/bez.js
@@ -41,21 +41,21 @@
var ptDistance;
var point = [],
lastPoint = [];
- var lengthData = bezier_length_pool.newElement();
+ var lengthData = bezierLengthPool.newElement();
len = pt3.length;
for (k = 0; k < curveSegments; k += 1) {
perc = k / (curveSegments - 1);
ptDistance = 0;
for (i = 0; i < len; i += 1) {
- ptCoord = bm_pow(1 - perc, 3) * pt1[i] + 3 * bm_pow(1 - perc, 2) * perc * pt3[i] + 3 * (1 - perc) * bm_pow(perc, 2) * pt4[i] + bm_pow(perc, 3) * pt2[i];
+ ptCoord = bmPow(1 - perc, 3) * pt1[i] + 3 * bmPow(1 - perc, 2) * perc * pt3[i] + 3 * (1 - perc) * bmPow(perc, 2) * pt4[i] + bmPow(perc, 3) * pt2[i];
point[i] = ptCoord;
if (lastPoint[i] !== null) {
- ptDistance += bm_pow(point[i] - lastPoint[i], 2);
+ ptDistance += bmPow(point[i] - lastPoint[i], 2);
}
lastPoint[i] = point[i];
}
if (ptDistance) {
- ptDistance = bm_sqrt(ptDistance);
+ ptDistance = bmSqrt(ptDistance);
addedLength += ptDistance;
}
lengthData.percents[k] = perc;
@@ -67,7 +67,7 @@
}());
function getSegmentsLength(shapeData) {
- var segmentsLength = segments_length_pool.newElement();
+ var segmentsLength = segmentsLengthPool.newElement();
var closed = shapeData.c;
var pathV = shapeData.v;
var pathO = shapeData.o;
@@ -124,13 +124,13 @@
perc = k / (curveSegments - 1);
ptDistance = 0;
for (i = 0; i < len; i += 1) {
- ptCoord = bm_pow(1 - perc, 3) * pt1[i] + 3 * bm_pow(1 - perc, 2) * perc * (pt1[i] + pt3[i]) + 3 * (1 - perc) * bm_pow(perc, 2) * (pt2[i] + pt4[i]) + bm_pow(perc, 3) * pt2[i];
+ ptCoord = bmPow(1 - perc, 3) * pt1[i] + 3 * bmPow(1 - perc, 2) * perc * (pt1[i] + pt3[i]) + 3 * (1 - perc) * bmPow(perc, 2) * (pt2[i] + pt4[i]) + bmPow(perc, 3) * pt2[i];
point[i] = ptCoord;
if (lastPoint !== null) {
- ptDistance += bm_pow(point[i] - lastPoint[i], 2);
+ ptDistance += bmPow(point[i] - lastPoint[i], 2);
}
}
- ptDistance = bm_sqrt(ptDistance);
+ ptDistance = bmSqrt(ptDistance);
addedLength += ptDistance;
bezierData.points[k] = new PointData(ptDistance, point);
lastPoint = point;
@@ -146,7 +146,7 @@
var percents = bezierData.percents;
var lengths = bezierData.lengths;
var len = percents.length;
- var initPos = bm_floor((len - 1) * perc);
+ var initPos = bmFloor((len - 1) * perc);
var lengthPos = perc * bezierData.addedLength;
var lPerc = 0;
if (initPos === len - 1 || initPos === 0 || lengthPos === lengths[initPos]) {
@@ -185,7 +185,7 @@
}
- var bezier_segment_points = createTypedArray('float32', 8);
+ var bezierSegmentPoints = createTypedArray('float32', 8);
function getNewSegment(pt1, pt2, pt3, pt4, startPerc, endPerc, bezierData) {
if (startPerc < 0) {
@@ -201,32 +201,32 @@
var u0 = 1 - t0;
var u1 = 1 - t1;
var u0u0u0 = u0 * u0 * u0;
- var t0u0u0_3 = t0 * u0 * u0 * 3;
- var t0t0u0_3 = t0 * t0 * u0 * 3;
+ var t0u0u0_3 = t0 * u0 * u0 * 3; // eslint-disable-line camelcase
+ var t0t0u0_3 = t0 * t0 * u0 * 3; // eslint-disable-line camelcase
var t0t0t0 = t0 * t0 * t0;
//
var u0u0u1 = u0 * u0 * u1;
- var t0u0u1_3 = t0 * u0 * u1 + u0 * t0 * u1 + u0 * u0 * t1;
- var t0t0u1_3 = t0 * t0 * u1 + u0 * t0 * t1 + t0 * u0 * t1;
+ var t0u0u1_3 = t0 * u0 * u1 + u0 * t0 * u1 + u0 * u0 * t1; // eslint-disable-line camelcase
+ var t0t0u1_3 = t0 * t0 * u1 + u0 * t0 * t1 + t0 * u0 * t1; // eslint-disable-line camelcase
var t0t0t1 = t0 * t0 * t1;
//
var u0u1u1 = u0 * u1 * u1;
- var t0u1u1_3 = t0 * u1 * u1 + u0 * t1 * u1 + u0 * u1 * t1;
- var t0t1u1_3 = t0 * t1 * u1 + u0 * t1 * t1 + t0 * u1 * t1;
+ var t0u1u1_3 = t0 * u1 * u1 + u0 * t1 * u1 + u0 * u1 * t1; // eslint-disable-line camelcase
+ var t0t1u1_3 = t0 * t1 * u1 + u0 * t1 * t1 + t0 * u1 * t1; // eslint-disable-line camelcase
var t0t1t1 = t0 * t1 * t1;
//
var u1u1u1 = u1 * u1 * u1;
- var t1u1u1_3 = t1 * u1 * u1 + u1 * t1 * u1 + u1 * u1 * t1;
- var t1t1u1_3 = t1 * t1 * u1 + u1 * t1 * t1 + t1 * u1 * t1;
+ var t1u1u1_3 = t1 * u1 * u1 + u1 * t1 * u1 + u1 * u1 * t1; // eslint-disable-line camelcase
+ var t1t1u1_3 = t1 * t1 * u1 + u1 * t1 * t1 + t1 * u1 * t1; // eslint-disable-line camelcase
var t1t1t1 = t1 * t1 * t1;
for (i = 0; i < len; i += 1) {
- bezier_segment_points[i * 4] = Math.round((u0u0u0 * pt1[i] + t0u0u0_3 * pt3[i] + t0t0u0_3 * pt4[i] + t0t0t0 * pt2[i]) * 1000) / 1000;
- bezier_segment_points[i * 4 + 1] = Math.round((u0u0u1 * pt1[i] + t0u0u1_3 * pt3[i] + t0t0u1_3 * pt4[i] + t0t0t1 * pt2[i]) * 1000) / 1000;
- bezier_segment_points[i * 4 + 2] = Math.round((u0u1u1 * pt1[i] + t0u1u1_3 * pt3[i] + t0t1u1_3 * pt4[i] + t0t1t1 * pt2[i]) * 1000) / 1000;
- bezier_segment_points[i * 4 + 3] = Math.round((u1u1u1 * pt1[i] + t1u1u1_3 * pt3[i] + t1t1u1_3 * pt4[i] + t1t1t1 * pt2[i]) * 1000) / 1000;
+ bezierSegmentPoints[i * 4] = Math.round((u0u0u0 * pt1[i] + t0u0u0_3 * pt3[i] + t0t0u0_3 * pt4[i] + t0t0t0 * pt2[i]) * 1000) / 1000; // eslint-disable-line camelcase
+ bezierSegmentPoints[i * 4 + 1] = Math.round((u0u0u1 * pt1[i] + t0u0u1_3 * pt3[i] + t0t0u1_3 * pt4[i] + t0t0t1 * pt2[i]) * 1000) / 1000; // eslint-disable-line camelcase
+ bezierSegmentPoints[i * 4 + 2] = Math.round((u0u1u1 * pt1[i] + t0u1u1_3 * pt3[i] + t0t1u1_3 * pt4[i] + t0t1t1 * pt2[i]) * 1000) / 1000; // eslint-disable-line camelcase
+ bezierSegmentPoints[i * 4 + 3] = Math.round((u1u1u1 * pt1[i] + t1u1u1_3 * pt3[i] + t1t1u1_3 * pt4[i] + t1t1t1 * pt2[i]) * 1000) / 1000; // eslint-disable-line camelcase
}
- return bezier_segment_points;
+ return bezierSegmentPoints;
}
return {
diff --git a/player/js/utils/common.js b/player/js/utils/common.js
index ae3154d..3176f8a 100644
--- a/player/js/utils/common.js
+++ b/player/js/utils/common.js
@@ -2,15 +2,12 @@
var expressionsPlugin;
var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
var cachedColors = {};
-var bm_rounder = Math.round;
-var bm_rnd;
-var bm_pow = Math.pow;
-var bm_sqrt = Math.sqrt;
-var bm_abs = Math.abs;
-var bm_floor = Math.floor;
-var bm_max = Math.max;
-var bm_min = Math.min;
-var blitter = 10;
+var bmRnd;
+var bmPow = Math.pow;
+var bmSqrt = Math.sqrt;
+var bmFloor = Math.floor;
+var bmMax = Math.max;
+var bmMin = Math.min;
var BMMath = {};
(function () {
@@ -44,9 +41,9 @@
function roundValues(flag) {
if (flag) {
- bm_rnd = Math.round;
+ bmRnd = Math.round;
} else {
- bm_rnd = function (val) {
+ bmRnd = function (val) {
return val;
};
}
diff --git a/player/js/utils/expressions/ExpressionManager.js b/player/js/utils/expressions/ExpressionManager.js
index dee8e8c..ce1509c 100644
--- a/player/js/utils/expressions/ExpressionManager.js
+++ b/player/js/utils/expressions/ExpressionManager.js
@@ -1,3 +1,5 @@
+/* eslint-disable camelcase */
+
var ExpressionManager = (function () {
'use strict';
var ob = {};
@@ -349,7 +351,7 @@
function createPath(points, inTangents, outTangents, closed) {
var i,
len = points.length;
- var path = shape_pool.newElement();
+ var path = shapePool.newElement();
path.setPathData(!!closed, len);
var arrPlaceholder = [0, 0],
inVertexPoint,
diff --git a/player/js/utils/expressions/ExpressionPropertyDecorator.js b/player/js/utils/expressions/ExpressionPropertyDecorator.js
index 51e40dc..a71fd53 100644
--- a/player/js/utils/expressions/ExpressionPropertyDecorator.js
+++ b/player/js/utils/expressions/ExpressionPropertyDecorator.js
@@ -311,7 +311,7 @@
// For now this caching object is created only when needed instead of creating it when the shape is initialized.
if (!this._cachingAtTime) {
this._cachingAtTime = {
- shapeValue: shape_pool.clone(this.pv),
+ shapeValue: shapePool.clone(this.pv),
lastIndex: 0,
lastTime: initialDefaultFrame,
};
diff --git a/player/js/utils/imagePreloader.js b/player/js/utils/imagePreloader.js
index b598f21..14c2a69 100644
--- a/player/js/utils/imagePreloader.js
+++ b/player/js/utils/imagePreloader.js
@@ -18,7 +18,7 @@
}
}
- function getAssetsPath(assetData, assetsPath, original_path) {
+ function getAssetsPath(assetData, assetsPath, originalPath) {
var path = '';
if (assetData.e) {
path = assetData.p;
@@ -29,7 +29,7 @@
}
path = assetsPath + imagePath;
} else {
- path = original_path;
+ path = originalPath;
path += assetData.u ? assetData.u : '';
path += assetData.p;
}
diff --git a/player/js/utils/pooling/bezier_length_pool.js b/player/js/utils/pooling/bezier_length_pool.js
index 37d992d..5cc041d 100644
--- a/player/js/utils/pooling/bezier_length_pool.js
+++ b/player/js/utils/pooling/bezier_length_pool.js
@@ -1,4 +1,4 @@
-var bezier_length_pool = (function () {
+var bezierLengthPool = (function () {
function create() {
return {
addedLength: 0,
@@ -6,5 +6,5 @@
lengths: createTypedArray('float32', defaultCurveSegments),
};
}
- return pool_factory(8, create);
+ return poolFactory(8, create);
}());
diff --git a/player/js/utils/pooling/point_pool.js b/player/js/utils/pooling/point_pool.js
index aa7da98..08dd24f 100644
--- a/player/js/utils/pooling/point_pool.js
+++ b/player/js/utils/pooling/point_pool.js
@@ -1,6 +1,6 @@
-var point_pool = (function () {
+var pointPool = (function () {
function create() {
return createTypedArray('float32', 2);
}
- return pool_factory(8, create);
+ return poolFactory(8, create);
}());
diff --git a/player/js/utils/pooling/pool_factory.js b/player/js/utils/pooling/pool_factory.js
index 0369fd1..5b8ae7f 100644
--- a/player/js/utils/pooling/pool_factory.js
+++ b/player/js/utils/pooling/pool_factory.js
@@ -1,4 +1,4 @@
-var pool_factory = (function () {
+var poolFactory = (function () {
return function (initialLength, _create, _release, _clone) {
var _length = 0;
var _maxLength = initialLength;
diff --git a/player/js/utils/pooling/segments_length_pool.js b/player/js/utils/pooling/segments_length_pool.js
index da5e14b..dc85134 100644
--- a/player/js/utils/pooling/segments_length_pool.js
+++ b/player/js/utils/pooling/segments_length_pool.js
@@ -1,4 +1,4 @@
-var segments_length_pool = (function () {
+var segmentsLengthPool = (function () {
function create() {
return {
lengths: [],
@@ -10,10 +10,10 @@
var i,
len = element.lengths.length;
for (i = 0; i < len; i += 1) {
- bezier_length_pool.release(element.lengths[i]);
+ bezierLengthPool.release(element.lengths[i]);
}
element.lengths.length = 0;
}
- return pool_factory(8, create, release);
+ return poolFactory(8, create, release);
}());
diff --git a/player/js/utils/pooling/shapeCollection_pool.js b/player/js/utils/pooling/shapeCollection_pool.js
index 4aecbaf..2484cc0 100644
--- a/player/js/utils/pooling/shapeCollection_pool.js
+++ b/player/js/utils/pooling/shapeCollection_pool.js
@@ -1,4 +1,4 @@
-var shapeCollection_pool = (function () {
+var shapeCollectionPool = (function () {
var ob = {
newShapeCollection: newShapeCollection,
release: release,
@@ -23,7 +23,7 @@
var i,
len = shapeCollection._length;
for (i = 0; i < len; i += 1) {
- shape_pool.release(shapeCollection.shapes[i]);
+ shapePool.release(shapeCollection.shapes[i]);
}
shapeCollection._length = 0;
diff --git a/player/js/utils/pooling/shape_pool.js b/player/js/utils/pooling/shape_pool.js
index 381257a..5a24304 100644
--- a/player/js/utils/pooling/shape_pool.js
+++ b/player/js/utils/pooling/shape_pool.js
@@ -1,4 +1,4 @@
-var shape_pool = (function () {
+var shapePool = (function () {
function create() {
return new ShapePath();
}
@@ -7,9 +7,9 @@
var len = shapePath._length,
i;
for (i = 0; i < len; i += 1) {
- point_pool.release(shapePath.v[i]);
- point_pool.release(shapePath.i[i]);
- point_pool.release(shapePath.o[i]);
+ pointPool.release(shapePath.v[i]);
+ pointPool.release(shapePath.i[i]);
+ pointPool.release(shapePath.o[i]);
shapePath.v[i] = null;
shapePath.i[i] = null;
shapePath.o[i] = null;
@@ -32,7 +32,7 @@
return cloned;
}
- var factory = pool_factory(4, create, release);
+ var factory = poolFactory(4, create, release);
factory.clone = clone;
return factory;
diff --git a/player/js/utils/shapes/PuckerAndBloatModifier.js b/player/js/utils/shapes/PuckerAndBloatModifier.js
index b5776c9..ded252c 100644
--- a/player/js/utils/shapes/PuckerAndBloatModifier.js
+++ b/player/js/utils/shapes/PuckerAndBloatModifier.js
@@ -17,8 +17,8 @@
}
centerPoint[0] /= pathLength;
centerPoint[1] /= pathLength;
- var cloned_path = shape_pool.newElement();
- cloned_path.c = path.c;
+ var clonedPath = shapePool.newElement();
+ clonedPath.c = path.c;
var vX,
vY,
oX,
@@ -32,9 +32,9 @@
oY = path.o[i][1] + (centerPoint[1] - path.o[i][1]) * -percent;
iX = path.i[i][0] + (centerPoint[0] - path.i[i][0]) * -percent;
iY = path.i[i][1] + (centerPoint[1] - path.i[i][1]) * -percent;
- cloned_path.setTripleAt(vX, vY, oX, oY, iX, iY, i);
+ clonedPath.setTripleAt(vX, vY, oX, oY, iX, iY, i);
}
- return cloned_path;
+ return clonedPath;
};
PuckerAndBloatModifier.prototype.processShapes = function (_isFirstFrame) {
diff --git a/player/js/utils/shapes/RoundCornersModifier.js b/player/js/utils/shapes/RoundCornersModifier.js
index 4096633..ff6c8b8 100644
--- a/player/js/utils/shapes/RoundCornersModifier.js
+++ b/player/js/utils/shapes/RoundCornersModifier.js
@@ -7,8 +7,8 @@
};
RoundCornersModifier.prototype.processPath = function (path, round) {
- var cloned_path = shape_pool.newElement();
- cloned_path.c = path.c;
+ var clonedPath = shapePool.newElement();
+ clonedPath.c = path.c;
var i,
len = path._length;
var currentV,
@@ -33,10 +33,10 @@
currentI = path.i[i];
if (currentV[0] === currentO[0] && currentV[1] === currentO[1] && currentV[0] === currentI[0] && currentV[1] === currentI[1]) {
if ((i === 0 || i === len - 1) && !path.c) {
- cloned_path.setTripleAt(currentV[0], currentV[1], currentO[0], currentO[1], currentI[0], currentI[1], index);
- /* cloned_path.v[index] = currentV;
- cloned_path.o[index] = currentO;
- cloned_path.i[index] = currentI; */
+ clonedPath.setTripleAt(currentV[0], currentV[1], currentO[0], currentO[1], currentI[0], currentI[1], index);
+ /* clonedPath.v[index] = currentV;
+ clonedPath.o[index] = currentO;
+ clonedPath.i[index] = currentI; */
index += 1;
} else {
if (i === 0) {
@@ -52,7 +52,7 @@
vY = iY;
oX = vX - (vX - currentV[0]) * roundCorner;
oY = vY - (vY - currentV[1]) * roundCorner;
- cloned_path.setTripleAt(vX, vY, oX, oY, iX, iY, index);
+ clonedPath.setTripleAt(vX, vY, oX, oY, iX, iY, index);
index += 1;
if (i === len - 1) {
@@ -68,15 +68,15 @@
vY = oY;
iX = vX - (vX - currentV[0]) * roundCorner;
iY = vY - (vY - currentV[1]) * roundCorner;
- cloned_path.setTripleAt(vX, vY, oX, oY, iX, iY, index);
+ clonedPath.setTripleAt(vX, vY, oX, oY, iX, iY, index);
index += 1;
}
} else {
- cloned_path.setTripleAt(path.v[i][0], path.v[i][1], path.o[i][0], path.o[i][1], path.i[i][0], path.i[i][1], index);
+ clonedPath.setTripleAt(path.v[i][0], path.v[i][1], path.o[i][0], path.o[i][1], path.i[i][0], path.i[i][1], index);
index += 1;
}
}
- return cloned_path;
+ return clonedPath;
};
RoundCornersModifier.prototype.processShapes = function (_isFirstFrame) {
diff --git a/player/js/utils/shapes/ShapeCollection.js b/player/js/utils/shapes/ShapeCollection.js
index f56dd55..eb50b99 100644
--- a/player/js/utils/shapes/ShapeCollection.js
+++ b/player/js/utils/shapes/ShapeCollection.js
@@ -16,7 +16,7 @@
ShapeCollection.prototype.releaseShapes = function () {
var i;
for (i = 0; i < this._length; i += 1) {
- shape_pool.release(this.shapes[i]);
+ shapePool.release(this.shapes[i]);
}
this._length = 0;
};
diff --git a/player/js/utils/shapes/ShapeModifiers.js b/player/js/utils/shapes/ShapeModifiers.js
index 5069526..62cccb0 100644
--- a/player/js/utils/shapes/ShapeModifiers.js
+++ b/player/js/utils/shapes/ShapeModifiers.js
@@ -24,7 +24,7 @@
if (!this.closed) {
// Adding shape to dynamic properties. It covers the case where a shape has no effects applied, to reset it's _mdf state on every tick.
data.sh.container.addDynamicProperty(data.sh);
- var shapeData = { shape: data.sh, data: data, localShapeCollection: shapeCollection_pool.newShapeCollection() };
+ var shapeData = { shape: data.sh, data: data, localShapeCollection: shapeCollectionPool.newShapeCollection() };
this.shapes.push(shapeData);
this.addShapeToModifier(shapeData);
if (this._isAnimated) {
diff --git a/player/js/utils/shapes/ShapePath.js b/player/js/utils/shapes/ShapePath.js
index 2cab7c2..06faec6 100644
--- a/player/js/utils/shapes/ShapePath.js
+++ b/player/js/utils/shapes/ShapePath.js
@@ -12,9 +12,9 @@
this.setLength(len);
var i = 0;
while (i < len) {
- this.v[i] = point_pool.newElement();
- this.o[i] = point_pool.newElement();
- this.i[i] = point_pool.newElement();
+ this.v[i] = pointPool.newElement();
+ this.o[i] = pointPool.newElement();
+ this.i[i] = pointPool.newElement();
i += 1;
}
};
@@ -54,7 +54,7 @@
break;
}
if (!arr[pos] || (arr[pos] && !replace)) {
- arr[pos] = point_pool.newElement();
+ arr[pos] = pointPool.newElement();
}
arr[pos][0] = x;
arr[pos][1] = y;
diff --git a/player/js/utils/shapes/ShapeProperty.js b/player/js/utils/shapes/ShapeProperty.js
index ba8ab15..6f3129a 100644
--- a/player/js/utils/shapes/ShapeProperty.js
+++ b/player/js/utils/shapes/ShapeProperty.js
@@ -120,7 +120,7 @@
function setVValue(newPath) {
if (!shapesEqual(this.v, newPath)) {
- this.v = shape_pool.clone(newPath);
+ this.v = shapePool.clone(newPath);
this.localShapeCollection.releaseShapes();
this.localShapeCollection.addShape(this.v);
this._mdf = true;
@@ -169,9 +169,9 @@
this.kf = false;
this._mdf = false;
var pathData = type === 3 ? data.pt.k : data.ks.k;
- this.v = shape_pool.clone(pathData);
- this.pv = shape_pool.clone(this.v);
- this.localShapeCollection = shapeCollection_pool.newShapeCollection();
+ this.v = shapePool.clone(pathData);
+ this.pv = shapePool.clone(this.v);
+ this.localShapeCollection = shapeCollectionPool.newShapeCollection();
this.paths = this.localShapeCollection;
this.paths.addShape(this.v);
this.reset = resetShape;
@@ -200,10 +200,10 @@
var i,
len = this.keyframes[0].s[0].i.length;
var jLen = this.keyframes[0].s[0].i[0].length;
- this.v = shape_pool.newElement();
+ this.v = shapePool.newElement();
this.v.setPathData(this.keyframes[0].s[0].c, len);
- this.pv = shape_pool.clone(this.v);
- this.localShapeCollection = shapeCollection_pool.newShapeCollection();
+ this.pv = shapePool.clone(this.v);
+ this.localShapeCollection = shapeCollectionPool.newShapeCollection();
this.paths = this.localShapeCollection;
this.paths.addShape(this.v);
this.lastFrame = initFrame;
@@ -226,9 +226,9 @@
o: createSizedArray(4),
c: true
}; */
- this.v = shape_pool.newElement();
+ this.v = shapePool.newElement();
this.v.setPathData(true, 4);
- this.localShapeCollection = shapeCollection_pool.newShapeCollection();
+ this.localShapeCollection = shapeCollectionPool.newShapeCollection();
this.paths = this.localShapeCollection;
this.localShapeCollection.addShape(this.v);
this.d = data.d;
@@ -300,7 +300,7 @@
var StarShapeProperty = (function () {
function StarShapePropertyFactory(elem, data) {
- this.v = shape_pool.newElement();
+ this.v = shapePool.newElement();
this.v.setPathData(true, 0);
this.elem = elem;
this.comp = elem.comp;
@@ -320,7 +320,7 @@
this.r = PropertyFactory.getProp(elem, data.r, 0, degToRads, this);
this.or = PropertyFactory.getProp(elem, data.or, 0, 0, this);
this.os = PropertyFactory.getProp(elem, data.os, 0, 0.01, this);
- this.localShapeCollection = shapeCollection_pool.newShapeCollection();
+ this.localShapeCollection = shapeCollectionPool.newShapeCollection();
this.localShapeCollection.addShape(this.v);
this.paths = this.localShapeCollection;
if (this.dynamicProperties.length) {
@@ -417,9 +417,9 @@
var RectShapeProperty = (function () {
function RectShapePropertyFactory(elem, data) {
- this.v = shape_pool.newElement();
+ this.v = shapePool.newElement();
this.v.c = true;
- this.localShapeCollection = shapeCollection_pool.newShapeCollection();
+ this.localShapeCollection = shapeCollectionPool.newShapeCollection();
this.localShapeCollection.addShape(this.v);
this.paths = this.localShapeCollection;
this.elem = elem;
@@ -444,7 +444,7 @@
p1 = this.p.v[1],
v0 = this.s.v[0] / 2,
v1 = this.s.v[1] / 2;
- var round = bm_min(v0, v1, this.r.v);
+ var round = bmMin(v0, v1, this.r.v);
var cPoint = round * (1 - roundCorner);
this.v._length = 0;
diff --git a/player/js/utils/shapes/TrimModifier.js b/player/js/utils/shapes/TrimModifier.js
index b3ab5ba..42b704e 100644
--- a/player/js/utils/shapes/TrimModifier.js
+++ b/player/js/utils/shapes/TrimModifier.js
@@ -70,7 +70,7 @@
var i,
len = pathsData.length;
for (i = 0; i < len; i += 1) {
- segments_length_pool.release(pathsData[i]);
+ segmentsLengthPool.release(pathsData[i]);
}
pathsData.length = 0;
return pathsData;
@@ -273,7 +273,7 @@
var initPos;
var newShape = true;
if (!shapePath) {
- shapePath = shape_pool.newElement();
+ shapePath = shapePool.newElement();
segmentCount = 0;
initPos = 0;
} else {
@@ -336,7 +336,7 @@
break;
}
if (i < len - 1) {
- shapePath = shape_pool.newElement();
+ shapePath = shapePool.newElement();
newShape = true;
shapes.push(shapePath);
segmentCount = 0;
diff --git a/player/js/utils/text/TextAnimatorDataProperty.js b/player/js/utils/text/TextAnimatorDataProperty.js
index c4b19a8..ea16045 100644
--- a/player/js/utils/text/TextAnimatorDataProperty.js
+++ b/player/js/utils/text/TextAnimatorDataProperty.js
@@ -1,24 +1,24 @@
function TextAnimatorDataProperty(elem, animatorProps, container) {
var defaultData = { propType: false };
var getProp = PropertyFactory.getProp;
- var textAnimator_animatables = animatorProps.a;
+ var textAnimatorAnimatables = animatorProps.a;
this.a = {
- r: textAnimator_animatables.r ? getProp(elem, textAnimator_animatables.r, 0, degToRads, container) : defaultData,
- rx: textAnimator_animatables.rx ? getProp(elem, textAnimator_animatables.rx, 0, degToRads, container) : defaultData,
- ry: textAnimator_animatables.ry ? getProp(elem, textAnimator_animatables.ry, 0, degToRads, container) : defaultData,
- sk: textAnimator_animatables.sk ? getProp(elem, textAnimator_animatables.sk, 0, degToRads, container) : defaultData,
- sa: textAnimator_animatables.sa ? getProp(elem, textAnimator_animatables.sa, 0, degToRads, container) : defaultData,
- s: textAnimator_animatables.s ? getProp(elem, textAnimator_animatables.s, 1, 0.01, container) : defaultData,
- a: textAnimator_animatables.a ? getProp(elem, textAnimator_animatables.a, 1, 0, container) : defaultData,
- o: textAnimator_animatables.o ? getProp(elem, textAnimator_animatables.o, 0, 0.01, container) : defaultData,
- p: textAnimator_animatables.p ? getProp(elem, textAnimator_animatables.p, 1, 0, container) : defaultData,
- sw: textAnimator_animatables.sw ? getProp(elem, textAnimator_animatables.sw, 0, 0, container) : defaultData,
- sc: textAnimator_animatables.sc ? getProp(elem, textAnimator_animatables.sc, 1, 0, container) : defaultData,
- fc: textAnimator_animatables.fc ? getProp(elem, textAnimator_animatables.fc, 1, 0, container) : defaultData,
- fh: textAnimator_animatables.fh ? getProp(elem, textAnimator_animatables.fh, 0, 0, container) : defaultData,
- fs: textAnimator_animatables.fs ? getProp(elem, textAnimator_animatables.fs, 0, 0.01, container) : defaultData,
- fb: textAnimator_animatables.fb ? getProp(elem, textAnimator_animatables.fb, 0, 0.01, container) : defaultData,
- t: textAnimator_animatables.t ? getProp(elem, textAnimator_animatables.t, 0, 0, container) : defaultData,
+ r: textAnimatorAnimatables.r ? getProp(elem, textAnimatorAnimatables.r, 0, degToRads, container) : defaultData,
+ rx: textAnimatorAnimatables.rx ? getProp(elem, textAnimatorAnimatables.rx, 0, degToRads, container) : defaultData,
+ ry: textAnimatorAnimatables.ry ? getProp(elem, textAnimatorAnimatables.ry, 0, degToRads, container) : defaultData,
+ sk: textAnimatorAnimatables.sk ? getProp(elem, textAnimatorAnimatables.sk, 0, degToRads, container) : defaultData,
+ sa: textAnimatorAnimatables.sa ? getProp(elem, textAnimatorAnimatables.sa, 0, degToRads, container) : defaultData,
+ s: textAnimatorAnimatables.s ? getProp(elem, textAnimatorAnimatables.s, 1, 0.01, container) : defaultData,
+ a: textAnimatorAnimatables.a ? getProp(elem, textAnimatorAnimatables.a, 1, 0, container) : defaultData,
+ o: textAnimatorAnimatables.o ? getProp(elem, textAnimatorAnimatables.o, 0, 0.01, container) : defaultData,
+ p: textAnimatorAnimatables.p ? getProp(elem, textAnimatorAnimatables.p, 1, 0, container) : defaultData,
+ sw: textAnimatorAnimatables.sw ? getProp(elem, textAnimatorAnimatables.sw, 0, 0, container) : defaultData,
+ sc: textAnimatorAnimatables.sc ? getProp(elem, textAnimatorAnimatables.sc, 1, 0, container) : defaultData,
+ fc: textAnimatorAnimatables.fc ? getProp(elem, textAnimatorAnimatables.fc, 1, 0, container) : defaultData,
+ fh: textAnimatorAnimatables.fh ? getProp(elem, textAnimatorAnimatables.fh, 0, 0, container) : defaultData,
+ fs: textAnimatorAnimatables.fs ? getProp(elem, textAnimatorAnimatables.fs, 0, 0.01, container) : defaultData,
+ fb: textAnimatorAnimatables.fb ? getProp(elem, textAnimatorAnimatables.fb, 0, 0.01, container) : defaultData,
+ t: textAnimatorAnimatables.t ? getProp(elem, textAnimatorAnimatables.t, 0, 0, container) : defaultData,
};
this.s = TextSelectorProp.getTextSelectorProp(elem, animatorProps.s, container);
