filter/source/svg/presentation_engine.js | 795 +++++++++----------------------
1 file changed, 236 insertions(+), 559 deletions(-)
New commits:
commit 44b14e8c7c485d8a3bb99d9484ac63273988b633
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 04:23:31 2017 +0200
svg filter: fix SweepWipePath.perform (found by eslint no-undef)
Change-Id: I98d64618d28a06a04ce4e191be6ed90bc9af07bb
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 01c49ef551b2..55b0221c7563 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -9922,14 +9922,14 @@ SweepWipePath.prototype.perform = function( nT ) {
if(!this.bSingle && !this.bOppositeVertical)
nT /= 2.0;
- var aBasePath = PinWheelWipePath.calcCenteredClock( nT + 0.25, 1.0 );
+ var poly = PinWheelWipePath.calcCenteredClock( nT + 0.25, 1.0 );
var aTransform;
if(this.bCenter) {
aTransform = SVGIdentityMatrix.translate(0.5, 0.0);
- aBasePath.matrixTransform(aTransform);
+ poly.matrixTransform(aTransform);
}
- var res = aBasePath;
+ var res = poly;
if(!this.bSingle) {
if(this.bOppositeVertical) {
commit 36e421ce36b77e3d35daeea35d998bcf4223dd08
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 04:17:20 2017 +0200
svg filter: fix eslint no-redeclare
Change-Id: I8435d991c582d2b3102d3a42984bb773fddae87c
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index a5b4fe510f78..01c49ef551b2 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -1584,33 +1584,49 @@ function configureDetectionTools()
this._skipOptionalSpaces();
return new SVGPathSegClosePath(owningPathSegList);
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_REL:
- var points = {x1: this._parseNumber(), y1:
this._parseNumber(), x2: this._parseNumber(), y2: this._parseNumber(), x:
this._parseNumber(), y: this._parseNumber()};
+ {
+ const points = {x1: this._parseNumber(), y1:
this._parseNumber(), x2: this._parseNumber(), y2: this._parseNumber(), x:
this._parseNumber(), y: this._parseNumber()};
return new
SVGPathSegCurvetoCubicRel(owningPathSegList, points.x, points.y, points.x1,
points.y1, points.x2, points.y2);
+ }
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_ABS:
- var points = {x1: this._parseNumber(), y1:
this._parseNumber(), x2: this._parseNumber(), y2: this._parseNumber(), x:
this._parseNumber(), y: this._parseNumber()};
+ {
+ const points = {x1: this._parseNumber(), y1:
this._parseNumber(), x2: this._parseNumber(), y2: this._parseNumber(), x:
this._parseNumber(), y: this._parseNumber()};
return new
SVGPathSegCurvetoCubicAbs(owningPathSegList, points.x, points.y, points.x1,
points.y1, points.x2, points.y2);
+ }
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_SMOOTH_REL:
- var points = {x2: this._parseNumber(), y2:
this._parseNumber(), x: this._parseNumber(), y: this._parseNumber()};
+ {
+ const points = {x2: this._parseNumber(), y2:
this._parseNumber(), x: this._parseNumber(), y: this._parseNumber()};
return new
SVGPathSegCurvetoCubicSmoothRel(owningPathSegList, points.x, points.y,
points.x2, points.y2);
+ }
case SVGPathSeg.PATHSEG_CURVETO_CUBIC_SMOOTH_ABS:
- var points = {x2: this._parseNumber(), y2:
this._parseNumber(), x: this._parseNumber(), y: this._parseNumber()};
+ {
+ const points = {x2: this._parseNumber(), y2:
this._parseNumber(), x: this._parseNumber(), y: this._parseNumber()};
return new
SVGPathSegCurvetoCubicSmoothAbs(owningPathSegList, points.x, points.y,
points.x2, points.y2);
+ }
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_REL:
- var points = {x1: this._parseNumber(), y1:
this._parseNumber(), x: this._parseNumber(), y: this._parseNumber()};
+ {
+ const points = {x1: this._parseNumber(), y1:
this._parseNumber(), x: this._parseNumber(), y: this._parseNumber()};
return new
SVGPathSegCurvetoQuadraticRel(owningPathSegList, points.x, points.y, points.x1,
points.y1);
+ }
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_ABS:
- var points = {x1: this._parseNumber(), y1:
this._parseNumber(), x: this._parseNumber(), y: this._parseNumber()};
+ {
+ const points = {x1: this._parseNumber(), y1:
this._parseNumber(), x: this._parseNumber(), y: this._parseNumber()};
return new
SVGPathSegCurvetoQuadraticAbs(owningPathSegList, points.x, points.y, points.x1,
points.y1);
+ }
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL:
return new
SVGPathSegCurvetoQuadraticSmoothRel(owningPathSegList, this._parseNumber(),
this._parseNumber());
case SVGPathSeg.PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS:
return new
SVGPathSegCurvetoQuadraticSmoothAbs(owningPathSegList, this._parseNumber(),
this._parseNumber());
case SVGPathSeg.PATHSEG_ARC_REL:
- var points = {x1: this._parseNumber(), y1:
this._parseNumber(), arcAngle: this._parseNumber(), arcLarge:
this._parseArcFlag(), arcSweep: this._parseArcFlag(), x: this._parseNumber(),
y: this._parseNumber()};
+ {
+ const points = {x1: this._parseNumber(), y1:
this._parseNumber(), arcAngle: this._parseNumber(), arcLarge:
this._parseArcFlag(), arcSweep: this._parseArcFlag(), x: this._parseNumber(),
y: this._parseNumber()};
return new SVGPathSegArcRel(owningPathSegList,
points.x, points.y, points.x1, points.y1, points.arcAngle, points.arcLarge,
points.arcSweep);
+ }
case SVGPathSeg.PATHSEG_ARC_ABS:
- var points = {x1: this._parseNumber(), y1:
this._parseNumber(), arcAngle: this._parseNumber(), arcLarge:
this._parseArcFlag(), arcSweep: this._parseArcFlag(), x: this._parseNumber(),
y: this._parseNumber()};
+ {
+ const points = {x1: this._parseNumber(), y1:
this._parseNumber(), arcAngle: this._parseNumber(), arcLarge:
this._parseArcFlag(), arcSweep: this._parseArcFlag(), x: this._parseNumber(),
y: this._parseNumber()};
return new SVGPathSegArcAbs(owningPathSegList,
points.x, points.y, points.x1, points.y1, points.arcAngle, points.arcLarge,
points.arcSweep);
+ }
default:
throw 'Unknown path seg type.'
}
@@ -5150,41 +5166,39 @@ var DIAGONALTOPLEFT_TRANS_SUBTYPE = 48;
// 16
var CENTERTOP_TRANS_SUBTYPE = 49; // 48
var CENTERRIGHT_TRANS_SUBTYPE = 50; // 49
var TOP_TRANS_SUBTYPE = 51; // 50
-var RIGHT_TRANS_SUBTYPE = 52; // 22
-var BOTTOM_TRANS_SUBTYPE = 53; // 52
-var LEFT_TRANS_SUBTYPE = 54; // 20
-var CLOCKWISETOP_TRANS_SUBTYPE = 55; // 40
-var CLOCKWISERIGHT_TRANS_SUBTYPE = 56; // 41
-var CLOCKWISEBOTTOM_TRANS_SUBTYPE = 57; // 42
-var CLOCKWISELEFT_TRANS_SUBTYPE = 58; // 43
-var CLOCKWISETOPLEFT_TRANS_SUBTYPE = 59; // 44
-var COUNTERCLOCKWISEBOTTOMLEFT_TRANS_SUBTYPE = 60; // 45
-var CLOCKWISEBOTTOMRIGHT_TRANS_SUBTYPE = 61; // 46
-var COUNTERCLOCKWISETOPRIGHT_TRANS_SUBTYPE = 62; // 47
-var VERTICALLEFT_TRANS_SUBTYPE = 63; // 93
-var VERTICALRIGHT_TRANS_SUBTYPE = 64; // 94
-var HORIZONTALLEFT_TRANS_SUBTYPE = 65; // 95
-var HORIZONTALRIGHT_TRANS_SUBTYPE = 66; // 96
-var TOPLEFTCLOCKWISE_TRANS_SUBTYPE = 67; // 69
-var TOPRIGHTCLOCKWISE_TRANS_SUBTYPE = 68; // 70
-var BOTTOMRIGHTCLOCKWISE_TRANS_SUBTYPE = 69; // 71
-var BOTTOMLEFTCLOCKWISE_TRANS_SUBTYPE = 70; // 72
-var TOPLEFTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 71; // 73
-var TOPRIGHTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 72; // 74
-var BOTTOMRIGHTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 73; // 75
-var BOTTOMLEFTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 74; // 76
-var DOUBLEBARNDOOR_TRANS_SUBTYPE = 75; // 17
-var DOUBLEDIAMOND_TRANS_SUBTYPE = 76; // 18
-var VERTICALTOPSAME_TRANS_SUBTYPE = 77; // 77
-var VERTICALBOTTOMSAME_TRANS_SUBTYPE = 78; // 78
-var VERTICALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 79; // 79
-var VERTICALBOTTOMLEFTOPPOSITE_TRANS_SUBTYPE = 80; // 80
-var HORIZONTALLEFTSAME_TRANS_SUBTYPE = 81; // 81
-var HORIZONTALRIGHTSAME_TRANS_SUBTYPE = 82; // 82
-var HORIZONTALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 83; // 83
-var HORIZONTALTOPRIGHTOPPOSITE_TRANS_SUBTYPE = 84; // 84
-var DIAGONALBOTTOMLEFTOPPOSITE_TRANS_SUBTYPE = 85; // 85
-var DIAGONALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 86; // 86
+var BOTTOM_TRANS_SUBTYPE = 52; // 52
+var CLOCKWISETOP_TRANS_SUBTYPE = 53; // 40
+var CLOCKWISERIGHT_TRANS_SUBTYPE = 54; // 41
+var CLOCKWISEBOTTOM_TRANS_SUBTYPE = 55; // 42
+var CLOCKWISELEFT_TRANS_SUBTYPE = 56; // 43
+var CLOCKWISETOPLEFT_TRANS_SUBTYPE = 57; // 44
+var COUNTERCLOCKWISEBOTTOMLEFT_TRANS_SUBTYPE = 58; // 45
+var CLOCKWISEBOTTOMRIGHT_TRANS_SUBTYPE = 59; // 46
+var COUNTERCLOCKWISETOPRIGHT_TRANS_SUBTYPE = 60; // 47
+var VERTICALLEFT_TRANS_SUBTYPE = 61; // 93
+var VERTICALRIGHT_TRANS_SUBTYPE = 62; // 94
+var HORIZONTALLEFT_TRANS_SUBTYPE = 63; // 95
+var HORIZONTALRIGHT_TRANS_SUBTYPE = 64; // 96
+var TOPLEFTCLOCKWISE_TRANS_SUBTYPE = 65; // 69
+var TOPRIGHTCLOCKWISE_TRANS_SUBTYPE = 66; // 70
+var BOTTOMRIGHTCLOCKWISE_TRANS_SUBTYPE = 67; // 71
+var BOTTOMLEFTCLOCKWISE_TRANS_SUBTYPE = 68; // 72
+var TOPLEFTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 69; // 73
+var TOPRIGHTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 70; // 74
+var BOTTOMRIGHTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 71; // 75
+var BOTTOMLEFTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 72; // 76
+var DOUBLEBARNDOOR_TRANS_SUBTYPE = 73; // 17
+var DOUBLEDIAMOND_TRANS_SUBTYPE = 74; // 18
+var VERTICALTOPSAME_TRANS_SUBTYPE = 75; // 77
+var VERTICALBOTTOMSAME_TRANS_SUBTYPE = 76; // 78
+var VERTICALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 77; // 79
+var VERTICALBOTTOMLEFTOPPOSITE_TRANS_SUBTYPE = 78; // 80
+var HORIZONTALLEFTSAME_TRANS_SUBTYPE = 79; // 81
+var HORIZONTALRIGHTSAME_TRANS_SUBTYPE = 80; // 82
+var HORIZONTALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 81; // 83
+var HORIZONTALTOPRIGHTOPPOSITE_TRANS_SUBTYPE = 82; // 84
+var DIAGONALBOTTOMLEFTOPPOSITE_TRANS_SUBTYPE = 83; // 85
+var DIAGONALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 84; // 86
var aTransitionSubtypeInMap = {
'default' : DEFAULT_TRANS_SUBTYPE,
@@ -10524,7 +10538,7 @@ SnakeWipePath.prototype.calcHalfDiagonalSnake =
function(nT, bIn) {
aPath += 'L ' + aPoint.x + ' ' + aPoint.y + ' ';
aPoint.x = 0.0;
aPath += 'L ' + aPoint.x + ' ' + aPoint.y + ' ';
- var poly = document.createElementNS( NSS['svg'], 'path');
+ const poly = document.createElementNS( NSS['svg'], 'path');
poly.setAttribute('d', aPath);
res.appendPath(poly);
}
@@ -10541,9 +10555,9 @@ SnakeWipePath.prototype.calcHalfDiagonalSnake =
function(nT, bIn) {
aPath += 'L ' + aPoint.x + ' ' + aPoint.y + ' ';
aPoint.x = 0.0;
aPath += 'L ' + aPoint.x + ' ' + aPoint.y + ' ';
- var poly = document.createElementNS( NSS['svg'], 'path');
+ const poly = document.createElementNS( NSS['svg'], 'path');
poly.setAttribute('d', aPath);
- var aTransform;
+ let aTransform;
if((Math.floor(sqrtArea2) & 1) == 1) {
// odd line
@@ -10563,7 +10577,7 @@ SnakeWipePath.prototype.calcHalfDiagonalSnake =
function(nT, bIn) {
const sqrtArea2 = Math.sqrt(nT * this.sqrtElements *
this.sqrtElements);
const edge = pruneScaleValue(Math.floor(sqrtArea2)/this.sqrtElements);
- var aPath, aPoint = document.documentElement.createSVGPoint();
+ let aPath, aPoint = document.documentElement.createSVGPoint();
if(edge != 0) {
aPoint.y = 1.0;
aPath = 'M ' + aPoint.x + ' ' + aPoint.y + ' ';
@@ -10576,7 +10590,7 @@ SnakeWipePath.prototype.calcHalfDiagonalSnake =
function(nT, bIn) {
aPath += 'L ' + aPoint.x + ' ' + aPoint.y + ' ';
aPoint.x = 0.0;
aPath += 'L ' + aPoint.x + ' ' + aPoint.y + ' ';
- var poly = document.createElementNS( NSS['svg'], 'path');
+ const poly = document.createElementNS( NSS['svg'], 'path');
poly.setAttribute('d', aPath);
res.appendPath(poly);
}
@@ -10593,9 +10607,9 @@ SnakeWipePath.prototype.calcHalfDiagonalSnake =
function(nT, bIn) {
aPath += 'L ' + aPoint.x + ' ' + aPoint.y + ' ';
aPoint.x = 0.0;
aPath += 'L ' + aPoint.x + ' ' + aPoint.y + ' ';
- var poly = document.createElementNS( NSS['svg'], 'path');
+ const poly = document.createElementNS( NSS['svg'], 'path');
poly.setAttribute('d', aPath);
- var aTransform;
+ let aTransform;
if((Math.floor(sqrtArea2) & 1) == 1) {
// odd line
commit ebddd776583e65207d66fc277f732bfa3b17b818
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 04:09:37 2017 +0200
svg filter: fix eslint no-undef - var-declare stuff
Change-Id: I4cd00616f972a0be14ceff9311aafee39561ac35
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 0ddb2ceeaa41..a5b4fe510f78 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -4388,7 +4388,7 @@ HSLColor.interpolate = function( aFrom, aTo, nT, bCCW )
* SVGMatrix extensions
**********************************************************************************************/
-SVGIdentityMatrix = document.documentElement.createSVGMatrix();
+var SVGIdentityMatrix = document.documentElement.createSVGMatrix();
SVGMatrix.prototype.setToIdentity = function()
{
@@ -4770,7 +4770,7 @@ var ANIMATION_NODE_TRANSITIONFILTER = 9;
var ANIMATION_NODE_AUDIO = 10;
var ANIMATION_NODE_COMMAND = 11;
-aAnimationNodeTypeInMap = {
+var aAnimationNodeTypeInMap = {
'par' : ANIMATION_NODE_PAR,
'seq' : ANIMATION_NODE_SEQ,
'iterate' : ANIMATION_NODE_ITERATE,
@@ -4832,15 +4832,15 @@ function getNodeStateName( eNodeState )
// Impress Node Types
-IMPRESS_DEFAULT_NODE = 0;
-IMPRESS_ON_CLICK_NODE = 1;
-IMPRESS_WITH_PREVIOUS_NODE = 2;
-IMPRESS_AFTER_PREVIOUS_NODE = 3;
-IMPRESS_MAIN_SEQUENCE_NODE = 4;
-IMPRESS_TIMING_ROOT_NODE = 5;
-IMPRESS_INTERACTIVE_SEQUENCE_NODE = 6;
-
-aImpressNodeTypeInMap = {
+var IMPRESS_DEFAULT_NODE = 0;
+var IMPRESS_ON_CLICK_NODE = 1;
+var IMPRESS_WITH_PREVIOUS_NODE = 2;
+var IMPRESS_AFTER_PREVIOUS_NODE = 3;
+var IMPRESS_MAIN_SEQUENCE_NODE = 4;
+var IMPRESS_TIMING_ROOT_NODE = 5;
+var IMPRESS_INTERACTIVE_SEQUENCE_NODE = 6;
+
+var aImpressNodeTypeInMap = {
'on-click' : IMPRESS_ON_CLICK_NODE,
'with-previous' : IMPRESS_WITH_PREVIOUS_NODE,
'after-previous' : IMPRESS_AFTER_PREVIOUS_NODE,
@@ -4849,16 +4849,16 @@ aImpressNodeTypeInMap = {
'interactive-sequence' : IMPRESS_INTERACTIVE_SEQUENCE_NODE
};
-aImpressNodeTypeOutMap = [ 'default', 'on-click', 'with-previous',
'after-previous',
+var aImpressNodeTypeOutMap = [ 'default', 'on-click', 'with-previous',
'after-previous',
'main-sequence', 'timing-root',
'interactive-sequence' ];
// Preset Classes
-aPresetClassInMap = {};
+var aPresetClassInMap = {};
// Preset Ids
-aPresetIdInMap = {};
+var aPresetIdInMap = {};
// Restart Modes
@@ -4867,14 +4867,14 @@ var RESTART_MODE_ALWAYS = 1;
var RESTART_MODE_WHEN_NOT_ACTIVE = 2;
var RESTART_MODE_NEVER = 3;
-aRestartModeInMap = {
+var aRestartModeInMap = {
'inherit' : RESTART_MODE_DEFAULT,
'always' : RESTART_MODE_ALWAYS,
'whenNotActive' : RESTART_MODE_WHEN_NOT_ACTIVE,
'never' : RESTART_MODE_NEVER
};
-aRestartModeOutMap = [ 'inherit','always', 'whenNotActive', 'never' ];
+var aRestartModeOutMap = [ 'inherit','always', 'whenNotActive', 'never' ];
// Fill Modes
@@ -4885,7 +4885,7 @@ var FILL_MODE_HOLD = 3;
var FILL_MODE_TRANSITION = 4;
var FILL_MODE_AUTO = 5;
-aFillModeInMap = {
+var aFillModeInMap = {
'inherit' : FILL_MODE_DEFAULT,
'remove' : FILL_MODE_REMOVE,
'freeze' : FILL_MODE_FREEZE,
@@ -4894,7 +4894,7 @@ aFillModeInMap = {
'auto' : FILL_MODE_AUTO
};
-aFillModeOutMap = [ 'inherit', 'remove', 'freeze', 'hold', 'transition',
'auto' ];
+var aFillModeOutMap = [ 'inherit', 'remove', 'freeze', 'hold', 'transition',
'auto' ];
// Additive Modes
@@ -4904,7 +4904,7 @@ var ADDITIVE_MODE_REPLACE = 3;
var ADDITIVE_MODE_MULTIPLY = 4;
var ADDITIVE_MODE_NONE = 5;
-aAddittiveModeInMap = {
+var aAddittiveModeInMap = {
'base' : ADDITIVE_MODE_BASE,
'sum' : ADDITIVE_MODE_SUM,
'replace' : ADDITIVE_MODE_REPLACE,
@@ -4912,14 +4912,14 @@ aAddittiveModeInMap = {
'none' : ADDITIVE_MODE_NONE
};
-aAddittiveModeOutMap = [ 'unknown', 'base', 'sum', 'replace', 'multiply',
'none' ];
+var aAddittiveModeOutMap = [ 'unknown', 'base', 'sum', 'replace', 'multiply',
'none' ];
// Accumulate Modes
var ACCUMULATE_MODE_NONE = 0;
var ACCUMULATE_MODE_SUM = 1;
-aAccumulateModeOutMap = [ 'none', 'sum' ];
+var aAccumulateModeOutMap = [ 'none', 'sum' ];
// Calculation Modes
var CALC_MODE_DISCRETE = 1;
@@ -4927,43 +4927,43 @@ var CALC_MODE_LINEAR = 2;
var CALC_MODE_PACED = 3;
var CALC_MODE_SPLINE = 4;
-aCalcModeInMap = {
+var aCalcModeInMap = {
'discrete' : CALC_MODE_DISCRETE,
'linear' : CALC_MODE_LINEAR,
'paced' : CALC_MODE_PACED,
'spline' : CALC_MODE_SPLINE
};
-aCalcModeOutMap = [ 'unknown', 'discrete', 'linear', 'paced', 'spline' ];
+var aCalcModeOutMap = [ 'unknown', 'discrete', 'linear', 'paced', 'spline' ];
// Color Spaces
var COLOR_SPACE_RGB = 0;
var COLOR_SPACE_HSL = 1;
-aColorSpaceInMap = { 'rgb': COLOR_SPACE_RGB, 'hsl': COLOR_SPACE_HSL };
+var aColorSpaceInMap = { 'rgb': COLOR_SPACE_RGB, 'hsl': COLOR_SPACE_HSL };
-aColorSpaceOutMap = [ 'rgb', 'hsl' ];
+var aColorSpaceOutMap = [ 'rgb', 'hsl' ];
// Clock Directions
var CLOCKWISE = 0;
var COUNTERCLOCKWISE = 1;
-aClockDirectionInMap = { 'clockwise': CLOCKWISE, 'counter-clockwise':
COUNTERCLOCKWISE };
+var aClockDirectionInMap = { 'clockwise': CLOCKWISE, 'counter-clockwise':
COUNTERCLOCKWISE };
-aClockDirectionOutMap = [ 'clockwise', 'counter-clockwise' ];
+var aClockDirectionOutMap = [ 'clockwise', 'counter-clockwise' ];
// Attribute Value Types
-UNKNOWN_PROPERTY = 0; // TODO
-NUMBER_PROPERTY = 1;
-ENUM_PROPERTY = 2;
-COLOR_PROPERTY = 3;
-STRING_PROPERTY = 4;
-BOOL_PROPERTY = 5;
+var UNKNOWN_PROPERTY = 0; // TODO
+var NUMBER_PROPERTY = 1;
+var ENUM_PROPERTY = 2;
+var COLOR_PROPERTY = 3;
+var STRING_PROPERTY = 4;
+var BOOL_PROPERTY = 5;
-aValueTypeOutMap = [ 'unknown', 'number', 'enum', 'color', 'string', 'boolean'
];
+var aValueTypeOutMap = [ 'unknown', 'number', 'enum', 'color', 'string',
'boolean' ];
// Attribute Map
@@ -5029,9 +5029,9 @@ var aAttributeMap =
// Transition Classes
-TRANSITION_INVALID = 0; // Invalid type
-TRANSITION_CLIP_POLYPOLYGON = 1; // Transition expressed by parametric
clip polygon
-TRANSITION_SPECIAL = 2; // Transition expressed by
hand-crafted function
+var TRANSITION_INVALID = 0; // Invalid type
+var TRANSITION_CLIP_POLYPOLYGON = 1; // Transition expressed by
parametric clip polygon
+var TRANSITION_SPECIAL = 2; // Transition expressed by
hand-crafted function
/*
* All Transition types should be in sync with aTransitionTypeInMap:
@@ -5040,32 +5040,32 @@ TRANSITION_SPECIAL = 2; // Transition
expressed by hand-crafted
*/
// Transition Types
-BARWIPE_TRANSITION = 1;
-BOXWIPE_TRANSITION = 2;
-FOURBOXWIPE_TRANSITION = 3;
-ELLIPSEWIPE_TRANSITION = 4; // 17
-CLOCKWIPE_TRANSITION = 5; // 22
-PINWHEELWIPE_TRANSITION = 6; // 23
-PUSHWIPE_TRANSITION = 7; // 35
-SLIDEWIPE_TRANSITION = 8; // 36
-FADE_TRANSITION = 9; // 37
-RANDOMBARWIPE_TRANSITION = 10; // 38
-CHECKERBOARDWIPE_TRANSITION = 11; // 39
-DISSOLVE_TRANSITION = 12; // 40
-SNAKEWIPE_TRANSITION = 13; // 30
-PARALLELSNAKESWIPE_TRANSITION = 14; // 32
-IRISWIPE_TRANSITION = 15; // 12
-BARNDOORWIPE_TRANSITION = 16; // 4
-VEEWIPE_TRANSITION = 17; // 8
-ZIGZAGWIPE_TRANSITION = 18; // 10
-BARNZIGZAGWIPE_TRANSITION = 19; // 11
-FANWIPE_TRANSITION = 20; // 25
-SINGLESWEEPWIPE_TRANSITION = 21; // 24
-WATERFALLWIPE_TRANSITION = 22; // 34
-SPIRALWIPE_TRANSITION = 23; // 31
-MISCDIAGONALWIPE_TRANSITION = 24; // 7
-
-aTransitionTypeInMap = {
+var BARWIPE_TRANSITION = 1;
+var BOXWIPE_TRANSITION = 2;
+var FOURBOXWIPE_TRANSITION = 3;
+var ELLIPSEWIPE_TRANSITION = 4; // 17
+var CLOCKWIPE_TRANSITION = 5; // 22
+var PINWHEELWIPE_TRANSITION = 6; // 23
+var PUSHWIPE_TRANSITION = 7; // 35
+var SLIDEWIPE_TRANSITION = 8; // 36
+var FADE_TRANSITION = 9; // 37
+var RANDOMBARWIPE_TRANSITION = 10; // 38
+var CHECKERBOARDWIPE_TRANSITION = 11; // 39
+var DISSOLVE_TRANSITION = 12; // 40
+var SNAKEWIPE_TRANSITION = 13; // 30
+var PARALLELSNAKESWIPE_TRANSITION = 14; // 32
+var IRISWIPE_TRANSITION = 15; // 12
+var BARNDOORWIPE_TRANSITION = 16; // 4
+var VEEWIPE_TRANSITION = 17; // 8
+var ZIGZAGWIPE_TRANSITION = 18; // 10
+var BARNZIGZAGWIPE_TRANSITION = 19; // 11
+var FANWIPE_TRANSITION = 20; // 25
+var SINGLESWEEPWIPE_TRANSITION = 21; // 24
+var WATERFALLWIPE_TRANSITION = 22; // 34
+var SPIRALWIPE_TRANSITION = 23; // 31
+var MISCDIAGONALWIPE_TRANSITION = 24; // 7
+
+var aTransitionTypeInMap = {
'barWipe' : BARWIPE_TRANSITION,
'boxWipe' : BOXWIPE_TRANSITION,
'barnDoorWipe' : BARNDOORWIPE_TRANSITION,
@@ -5098,95 +5098,95 @@ aTransitionTypeInMap = {
* C++ implementations.
*/
// Transition Subtypes
-DEFAULT_TRANS_SUBTYPE = 0;
-LEFTTORIGHT_TRANS_SUBTYPE = 1;
-TOPTOBOTTOM_TRANS_SUBTYPE = 2;
-CORNERSIN_TRANS_SUBTYPE = 3; // 11
-CORNERSOUT_TRANS_SUBTYPE = 4;
-VERTICAL_TRANS_SUBTYPE = 5;
-HORIZONTAL_TRANS_SUBTYPE = 6; // 14
-DOWN_TRANS_SUBTYPE = 7; // 19
-CIRCLE_TRANS_SUBTYPE = 8; // 27
-CLOCKWISETWELVE_TRANS_SUBTYPE = 9; // 33
-CLOCKWISETHREE_TRANS_SUBTYPE = 10;
-CLOCKWISESIX_TRANS_SUBTYPE = 11;
-CLOCKWISENINE_TRANS_SUBTYPE = 12;
-TWOBLADEVERTICAL_TRANS_SUBTYPE = 13;
-TWOBLADEHORIZONTAL_TRANS_SUBTYPE = 14;
-FOURBLADE_TRANS_SUBTYPE = 15; // 39
-FROMLEFT_TRANS_SUBTYPE = 16; // 97
-FROMTOP_TRANS_SUBTYPE = 17;
-FROMRIGHT_TRANS_SUBTYPE = 18;
-FROMBOTTOM_TRANS_SUBTYPE = 19;
-CROSSFADE_TRANS_SUBTYPE = 20;
-FADETOCOLOR_TRANS_SUBTYPE = 21;
-FADEFROMCOLOR_TRANS_SUBTYPE = 22;
-FADEOVERCOLOR_TRANS_SUBTYPE = 23;
-THREEBLADE_TRANS_SUBTYPE = 24;
-EIGHTBLADE_TRANS_SUBTYPE = 25;
-ONEBLADE_TRANS_SUBTYPE = 26; // 107
-ACROSS_TRANS_SUBTYPE = 27;
-TOPLEFTVERTICAL_TRANS_SUBTYPE = 28; // 109
-TOPLEFTHORIZONTAL_TRANS_SUBTYPE = 29; // 64
-TOPLEFTDIAGONAL_TRANS_SUBTYPE = 30; // 65
-TOPRIGHTDIAGONAL_TRANS_SUBTYPE = 31; // 66
-BOTTOMRIGHTDIAGONAL_TRANS_SUBTYPE = 32; // 67
-BOTTOMLEFTDIAGONAL_TRANS_SUBTYPE = 33; // 68
-RECTANGLE_TRANS_SUBTYPE = 34; // 101
-DIAMOND_TRANS_SUBTYPE = 35; // 102
-TOPLEFT_TRANS_SUBTYPE = 36; // 3
-TOPRIGHT_TRANS_SUBTYPE = 37; // 4
-BOTTOMRIGHT_TRANS_SUBTYPE = 38; // 5
-BOTTOMLEFT_TRANS_SUBTYPE = 39; // 6
-TOPCENTER_TRANS_SUBTYPE = 40; // 7
-RIGHTCENTER_TRANS_SUBTYPE = 41; // 8
-BOTTOMCENTER_TRANS_SUBTYPE = 42; // 9
-LEFTCENTER_TRANS_SUBTYPE = 43; // 10
-LEFT_TRANS_SUBTYPE = 44; // 20
-UP_TRANS_SUBTYPE = 45; // 21
-RIGHT_TRANS_SUBTYPE = 46; // 22
-DIAGONALBOTTOMLEFT_TRANS_SUBTYPE = 47; // 15
-DIAGONALTOPLEFT_TRANS_SUBTYPE = 48; // 16
-CENTERTOP_TRANS_SUBTYPE = 49; // 48
-CENTERRIGHT_TRANS_SUBTYPE = 50; // 49
-TOP_TRANS_SUBTYPE = 51; // 50
-RIGHT_TRANS_SUBTYPE = 52; // 22
-BOTTOM_TRANS_SUBTYPE = 53; // 52
-LEFT_TRANS_SUBTYPE = 54; // 20
-CLOCKWISETOP_TRANS_SUBTYPE = 55; // 40
-CLOCKWISERIGHT_TRANS_SUBTYPE = 56; // 41
-CLOCKWISEBOTTOM_TRANS_SUBTYPE = 57; // 42
-CLOCKWISELEFT_TRANS_SUBTYPE = 58; // 43
-CLOCKWISETOPLEFT_TRANS_SUBTYPE = 59; // 44
-COUNTERCLOCKWISEBOTTOMLEFT_TRANS_SUBTYPE = 60; // 45
-CLOCKWISEBOTTOMRIGHT_TRANS_SUBTYPE = 61; // 46
-COUNTERCLOCKWISETOPRIGHT_TRANS_SUBTYPE = 62; // 47
-VERTICALLEFT_TRANS_SUBTYPE = 63; // 93
-VERTICALRIGHT_TRANS_SUBTYPE = 64; // 94
-HORIZONTALLEFT_TRANS_SUBTYPE = 65; // 95
-HORIZONTALRIGHT_TRANS_SUBTYPE = 66; // 96
-TOPLEFTCLOCKWISE_TRANS_SUBTYPE = 67; // 69
-TOPRIGHTCLOCKWISE_TRANS_SUBTYPE = 68; // 70
-BOTTOMRIGHTCLOCKWISE_TRANS_SUBTYPE = 69; // 71
-BOTTOMLEFTCLOCKWISE_TRANS_SUBTYPE = 70; // 72
-TOPLEFTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 71; // 73
-TOPRIGHTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 72; // 74
-BOTTOMRIGHTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 73; // 75
-BOTTOMLEFTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 74; // 76
-DOUBLEBARNDOOR_TRANS_SUBTYPE = 75; // 17
-DOUBLEDIAMOND_TRANS_SUBTYPE = 76; // 18
-VERTICALTOPSAME_TRANS_SUBTYPE = 77; // 77
-VERTICALBOTTOMSAME_TRANS_SUBTYPE = 78; // 78
-VERTICALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 79; // 79
-VERTICALBOTTOMLEFTOPPOSITE_TRANS_SUBTYPE = 80; // 80
-HORIZONTALLEFTSAME_TRANS_SUBTYPE = 81; // 81
-HORIZONTALRIGHTSAME_TRANS_SUBTYPE = 82; // 82
-HORIZONTALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 83; // 83
-HORIZONTALTOPRIGHTOPPOSITE_TRANS_SUBTYPE = 84; // 84
-DIAGONALBOTTOMLEFTOPPOSITE_TRANS_SUBTYPE = 85; // 85
-DIAGONALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 86; // 86
-
-aTransitionSubtypeInMap = {
+var DEFAULT_TRANS_SUBTYPE = 0;
+var LEFTTORIGHT_TRANS_SUBTYPE = 1;
+var TOPTOBOTTOM_TRANS_SUBTYPE = 2;
+var CORNERSIN_TRANS_SUBTYPE = 3; // 11
+var CORNERSOUT_TRANS_SUBTYPE = 4;
+var VERTICAL_TRANS_SUBTYPE = 5;
+var HORIZONTAL_TRANS_SUBTYPE = 6; // 14
+var DOWN_TRANS_SUBTYPE = 7; // 19
+var CIRCLE_TRANS_SUBTYPE = 8; // 27
+var CLOCKWISETWELVE_TRANS_SUBTYPE = 9; // 33
+var CLOCKWISETHREE_TRANS_SUBTYPE = 10;
+var CLOCKWISESIX_TRANS_SUBTYPE = 11;
+var CLOCKWISENINE_TRANS_SUBTYPE = 12;
+var TWOBLADEVERTICAL_TRANS_SUBTYPE = 13;
+var TWOBLADEHORIZONTAL_TRANS_SUBTYPE = 14;
+var FOURBLADE_TRANS_SUBTYPE = 15; // 39
+var FROMLEFT_TRANS_SUBTYPE = 16; // 97
+var FROMTOP_TRANS_SUBTYPE = 17;
+var FROMRIGHT_TRANS_SUBTYPE = 18;
+var FROMBOTTOM_TRANS_SUBTYPE = 19;
+var CROSSFADE_TRANS_SUBTYPE = 20;
+var FADETOCOLOR_TRANS_SUBTYPE = 21;
+var FADEFROMCOLOR_TRANS_SUBTYPE = 22;
+var FADEOVERCOLOR_TRANS_SUBTYPE = 23;
+var THREEBLADE_TRANS_SUBTYPE = 24;
+var EIGHTBLADE_TRANS_SUBTYPE = 25;
+var ONEBLADE_TRANS_SUBTYPE = 26; // 107
+var ACROSS_TRANS_SUBTYPE = 27;
+var TOPLEFTVERTICAL_TRANS_SUBTYPE = 28; // 109
+var TOPLEFTHORIZONTAL_TRANS_SUBTYPE = 29; // 64
+var TOPLEFTDIAGONAL_TRANS_SUBTYPE = 30; // 65
+var TOPRIGHTDIAGONAL_TRANS_SUBTYPE = 31; // 66
+var BOTTOMRIGHTDIAGONAL_TRANS_SUBTYPE = 32; // 67
+var BOTTOMLEFTDIAGONAL_TRANS_SUBTYPE = 33; // 68
+var RECTANGLE_TRANS_SUBTYPE = 34; // 101
+var DIAMOND_TRANS_SUBTYPE = 35; // 102
+var TOPLEFT_TRANS_SUBTYPE = 36; // 3
+var TOPRIGHT_TRANS_SUBTYPE = 37; // 4
+var BOTTOMRIGHT_TRANS_SUBTYPE = 38; // 5
+var BOTTOMLEFT_TRANS_SUBTYPE = 39; // 6
+var TOPCENTER_TRANS_SUBTYPE = 40; // 7
+var RIGHTCENTER_TRANS_SUBTYPE = 41; // 8
+var BOTTOMCENTER_TRANS_SUBTYPE = 42; // 9
+var LEFTCENTER_TRANS_SUBTYPE = 43; // 10
+var LEFT_TRANS_SUBTYPE = 44; // 20
+var UP_TRANS_SUBTYPE = 45; // 21
+var RIGHT_TRANS_SUBTYPE = 46; // 22
+var DIAGONALBOTTOMLEFT_TRANS_SUBTYPE = 47; // 15
+var DIAGONALTOPLEFT_TRANS_SUBTYPE = 48; // 16
+var CENTERTOP_TRANS_SUBTYPE = 49; // 48
+var CENTERRIGHT_TRANS_SUBTYPE = 50; // 49
+var TOP_TRANS_SUBTYPE = 51; // 50
+var RIGHT_TRANS_SUBTYPE = 52; // 22
+var BOTTOM_TRANS_SUBTYPE = 53; // 52
+var LEFT_TRANS_SUBTYPE = 54; // 20
+var CLOCKWISETOP_TRANS_SUBTYPE = 55; // 40
+var CLOCKWISERIGHT_TRANS_SUBTYPE = 56; // 41
+var CLOCKWISEBOTTOM_TRANS_SUBTYPE = 57; // 42
+var CLOCKWISELEFT_TRANS_SUBTYPE = 58; // 43
+var CLOCKWISETOPLEFT_TRANS_SUBTYPE = 59; // 44
+var COUNTERCLOCKWISEBOTTOMLEFT_TRANS_SUBTYPE = 60; // 45
+var CLOCKWISEBOTTOMRIGHT_TRANS_SUBTYPE = 61; // 46
+var COUNTERCLOCKWISETOPRIGHT_TRANS_SUBTYPE = 62; // 47
+var VERTICALLEFT_TRANS_SUBTYPE = 63; // 93
+var VERTICALRIGHT_TRANS_SUBTYPE = 64; // 94
+var HORIZONTALLEFT_TRANS_SUBTYPE = 65; // 95
+var HORIZONTALRIGHT_TRANS_SUBTYPE = 66; // 96
+var TOPLEFTCLOCKWISE_TRANS_SUBTYPE = 67; // 69
+var TOPRIGHTCLOCKWISE_TRANS_SUBTYPE = 68; // 70
+var BOTTOMRIGHTCLOCKWISE_TRANS_SUBTYPE = 69; // 71
+var BOTTOMLEFTCLOCKWISE_TRANS_SUBTYPE = 70; // 72
+var TOPLEFTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 71; // 73
+var TOPRIGHTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 72; // 74
+var BOTTOMRIGHTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 73; // 75
+var BOTTOMLEFTCOUNTERCLOCKWISE_TRANS_SUBTYPE = 74; // 76
+var DOUBLEBARNDOOR_TRANS_SUBTYPE = 75; // 17
+var DOUBLEDIAMOND_TRANS_SUBTYPE = 76; // 18
+var VERTICALTOPSAME_TRANS_SUBTYPE = 77; // 77
+var VERTICALBOTTOMSAME_TRANS_SUBTYPE = 78; // 78
+var VERTICALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 79; // 79
+var VERTICALBOTTOMLEFTOPPOSITE_TRANS_SUBTYPE = 80; // 80
+var HORIZONTALLEFTSAME_TRANS_SUBTYPE = 81; // 81
+var HORIZONTALRIGHTSAME_TRANS_SUBTYPE = 82; // 82
+var HORIZONTALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 83; // 83
+var HORIZONTALTOPRIGHTOPPOSITE_TRANS_SUBTYPE = 84; // 84
+var DIAGONALBOTTOMLEFTOPPOSITE_TRANS_SUBTYPE = 85; // 85
+var DIAGONALTOPLEFTOPPOSITE_TRANS_SUBTYPE = 86; // 86
+
+var aTransitionSubtypeInMap = {
'default' : DEFAULT_TRANS_SUBTYPE,
'leftToRight' : LEFTTORIGHT_TRANS_SUBTYPE,
'topToBottom' : TOPTOBOTTOM_TRANS_SUBTYPE,
@@ -5275,30 +5275,30 @@ aTransitionSubtypeInMap = {
};
// Transition Modes
-TRANSITION_MODE_IN = 1;
-TRANSITION_MODE_OUT = 0;
+var TRANSITION_MODE_IN = 1;
+var TRANSITION_MODE_OUT = 0;
-aTransitionModeOutMap = [ 'out', 'in' ];
+var aTransitionModeOutMap = [ 'out', 'in' ];
// Transition Reverse Methods
// Ignore direction attribute altogether.
// (If it has no sensible meaning for this transition.)
-REVERSEMETHOD_IGNORE = 0;
+var REVERSEMETHOD_IGNORE = 0;
// Revert by changing the direction of the parameter sweep.
// (From 1->0 instead of 0->1)
-REVERSEMETHOD_INVERT_SWEEP = 1;
+var REVERSEMETHOD_INVERT_SWEEP = 1;
// Revert by subtracting the generated polygon from the target bound rect.
-REVERSEMETHOD_SUBTRACT_POLYGON = 2;
+var REVERSEMETHOD_SUBTRACT_POLYGON = 2;
// Combination of REVERSEMETHOD_INVERT_SWEEP and
REVERSEMETHOD_SUBTRACT_POLYGON.
-REVERSEMETHOD_SUBTRACT_AND_INVERT = 3;
+var REVERSEMETHOD_SUBTRACT_AND_INVERT = 3;
// Reverse by rotating polygon 180 degrees.
-REVERSEMETHOD_ROTATE_180 = 4;
+var REVERSEMETHOD_ROTATE_180 = 4;
// Reverse by flipping polygon at the y axis.
-REVERSEMETHOD_FLIP_X = 5;
+var REVERSEMETHOD_FLIP_X = 5;
// Reverse by flipping polygon at the x axis.
-REVERSEMETHOD_FLIP_Y = 6;
+var REVERSEMETHOD_FLIP_Y = 6;
// Transition filter info table
@@ -6369,8 +6369,8 @@ var EVENT_TRIGGER_ON_NEXT_EFFECT = 9;
var EVENT_TRIGGER_ON_PREV_EFFECT = 10;
var EVENT_TRIGGER_REPEAT = 11; // TODO
-aEventTriggerOutMap = [ 'unknown', 'slideBegin', 'slideEnd', 'begin', 'end',
'click',
- 'doubleClick', 'mouseEnter', 'mouseLeave', 'next',
'previous', 'repeat' ];
+var aEventTriggerOutMap = [ 'unknown', 'slideBegin', 'slideEnd', 'begin',
'end', 'click',
+ 'doubleClick', 'mouseEnter', 'mouseLeave', 'next',
'previous', 'repeat' ];
function getEventTriggerType( sEventTrigger )
@@ -6402,7 +6402,7 @@ var EVENT_TIMING = 4;
var SYNCBASE_TIMING = 5;
var MEDIA_TIMING = 6; // TODO
-aTimingTypeOutMap = [ 'unknown', 'offset', 'wallclock', 'indefinite', 'event',
'syncbase', 'media' ];
+var aTimingTypeOutMap = [ 'unknown', 'offset', 'wallclock', 'indefinite',
'event', 'syncbase', 'media' ];
// Char Codes
commit 0a97a514aa5fe3297ec774c89a6a8174e1206b3b
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 03:59:35 2017 +0200
svg filter: fix eslint no-constant-condition
Change-Id: I8ac187702a3014f78bb711409770b4e8504bcd7d
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 4c42fc1ed72a..0ddb2ceeaa41 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -2345,10 +2345,6 @@ function MetaSlide( sMetaSlideId, aMetaDoc )
this.aSlideAnimationsHandler.importAnimations(
this.getSlideAnimationsRoot() );
this.aSlideAnimationsHandler.parseElements();
- // this statement is used only for debugging
- if( false && this.aSlideAnimationsHandler.aRootNode )
- log( this.aSlideAnimationsHandler.aRootNode.info( true ) );
-
// We collect text shapes included in this slide .
this.aTextShapeSet = this.collectTextShapes();
commit ed6ee28f57beb440006d04a694dd0715e152b690
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 03:44:20 2017 +0200
svg filter: fix eslint no-unused-vars
Change-Id: Ia3e80992d2c5310e0a2c810ef74d710f7a0e1e0b
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index e7bcca035a64..4c42fc1ed72a 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -4960,7 +4960,7 @@ aClockDirectionOutMap = [ 'clockwise',
'counter-clockwise' ];
// Attribute Value Types
-UNKNOWN_PROPERTY = 0;
+UNKNOWN_PROPERTY = 0; // TODO
NUMBER_PROPERTY = 1;
ENUM_PROPERTY = 2;
COLOR_PROPERTY = 3;
@@ -5037,8 +5037,6 @@ TRANSITION_INVALID = 0; // Invalid type
TRANSITION_CLIP_POLYPOLYGON = 1; // Transition expressed by parametric
clip polygon
TRANSITION_SPECIAL = 2; // Transition expressed by
hand-crafted function
-aTransitionClassOutMap = ['invalid', 'clip polypolygon', 'special'];
-
/*
* All Transition types should be in sync with aTransitionTypeInMap:
* Comments '//' followed by integers represent the transition values in their
@@ -5284,7 +5282,6 @@ aTransitionSubtypeInMap = {
TRANSITION_MODE_IN = 1;
TRANSITION_MODE_OUT = 0;
-aTransitionModeInMap = { 'out': TRANSITION_MODE_OUT, 'in': TRANSITION_MODE_IN
};
aTransitionModeOutMap = [ 'out', 'in' ];
@@ -5307,9 +5304,6 @@ REVERSEMETHOD_FLIP_X = 5;
// Reverse by flipping polygon at the x axis.
REVERSEMETHOD_FLIP_Y = 6;
-aReverseMethodOutMap = ['ignore', 'invert sweep', 'subtract polygon',
- 'subtract and invert', 'rotate 180', 'flip x', 'flip
y'];
-
// Transition filter info table
@@ -10518,7 +10512,7 @@ SnakeWipePath.prototype.calcSnake = function(t)
}
SnakeWipePath.prototype.calcHalfDiagonalSnake = function(nT, bIn) {
- var res = createEmptyPath(), aTransform;
+ var res = createEmptyPath();
if(bIn) {
const sqrtArea2 = Math.sqrt(nT * this.sqrtElements *
this.sqrtElements);
@@ -14756,7 +14750,7 @@ function extractAttributeValues( eValueType,
aValueList, aValueSet, aBBox, nSlid
}
-function evalValuesAttribute( aValueList, aValueSet, aBBox, nSlideWidth,
nSlideHeight )
+function evalValuesAttribute( aValueList, aValueSet )
{
var reMath = /abs|sqrt|asin|acos|atan|sin|cos|tan|exp|log|min|max/g;
commit 463378bc5d1ea91a5d0f71cd118bf2d06f724097
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 03:43:06 2017 +0200
svg filter: fix eslint no-unreachable
Change-Id: I111c30c9e379a04a17ee057e196efe7930758933
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index b89c6f787c61..e7bcca035a64 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -14623,7 +14623,6 @@ function createActivity( aActivityParamSet,
aAnimationNode, aAnimation, aInterpo
DiscreteFromToByActivity,
bAccumulate,
eValueType );
- break;
default:
log( 'createActivity: unexpected calculation mode: ' +
eCalcMode );
commit 93e956dfd14e709f81cb07bdbe31a5931728109e
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 03:42:32 2017 +0200
svg filter: fix eslint no-extra-semi
Change-Id: I21aa1bad2302536803d3da931cded84742733e05
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 8eee5535b0aa..b89c6f787c61 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -12412,7 +12412,7 @@ function WakeupEvent( aTimer, aActivityQueue )
{
WakeupEvent.superclass.constructor.call( this );
- this.aTimer = new ElapsedTime( aTimer );;
+ this.aTimer = new ElapsedTime( aTimer );
this.nNextTime = 0.0;
this.aActivity = null;
this.aActivityQueue = aActivityQueue;
commit 5b5fa803b3a8be9c43d725692b6015323b04dceb
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 03:42:05 2017 +0200
svg filter: fix eslint no-fallthrough
Change-Id: I2cbc4757042ed3934b0badff03fa291c9f36b6da
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 55d5194839af..8eee5535b0aa 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -9747,6 +9747,9 @@ function createClipPolyPolygon( nType, nSubtype )
return new BarnDoorWipePath(true /* Doubled */);
case DOUBLEDIAMOND_TRANS_SUBTYPE:
return new DoubleDiamondWipePath();
+ default:
+ log( 'createClipPolyPolygon: unhandled subtype: ' +
nSubtype );
+ return null;
}
case DISSOLVE_TRANSITION:
return new RandomWipePath( 16 * 16, false /* dissolve */ );
commit 0addc668d60ba16f8cb9884985fab3ea7d86d61b
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 03:37:20 2017 +0200
svg filter: fix eslint no-dupe-keys
Change-Id: Iea60d96b6b0c3ba84caa20dd4a0b429af20a5d09
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 458c88d89507..55d5194839af 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -5259,9 +5259,7 @@ aTransitionSubtypeInMap = {
'rightCenter' : RIGHTCENTER_TRANS_SUBTYPE,
'bottomCenter' : BOTTOMCENTER_TRANS_SUBTYPE,
'leftCenter' : LEFTCENTER_TRANS_SUBTYPE,
- 'left' : LEFT_TRANS_SUBTYPE,
'up' : UP_TRANS_SUBTYPE,
- 'right' : RIGHT_TRANS_SUBTYPE,
'diagonalBottomLeft' : DIAGONALBOTTOMLEFT_TRANS_SUBTYPE,
'diagonalTopLeft' : DIAGONALTOPLEFT_TRANS_SUBTYPE,
'verticalLeft' : VERTICALLEFT_TRANS_SUBTYPE,
commit d9e90d986fbf942db0272e52901c449a92b7fdf3
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 03:33:52 2017 +0200
svg filter: fix eslint assigned-not-used no-unused-vars errors
Change-Id: I15390770b908b281319c4f620732964755aea862
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 7109d77b9892..458c88d89507 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -1755,8 +1755,8 @@ var INDEX_MODE = 2;
// Mouse handler actions.
var MOUSE_UP = 1;
-var MOUSE_DOWN = 2;
-var MOUSE_MOVE = 3;
+var MOUSE_DOWN = 2; // TODO
+var MOUSE_MOVE = 3; // TODO
var MOUSE_WHEEL = 4;
// Key-codes.
@@ -1776,7 +1776,6 @@ var ESCAPE_KEY = 27;
var HIDDEN = 0;
var VISIBLE = 1;
var INHERIT = 2;
-var aVisibilityAttributeValue = [ 'hidden', 'visible', 'inherit' ];
var aVisibilityValue = { 'hidden' : HIDDEN, 'visible' : VISIBLE, 'inherit' :
INHERIT };
// Parameters
@@ -4868,7 +4867,6 @@ aPresetIdInMap = {};
// Restart Modes
var RESTART_MODE_DEFAULT = 0;
-var RESTART_MODE_INHERIT = 0;
var RESTART_MODE_ALWAYS = 1;
var RESTART_MODE_WHEN_NOT_ACTIVE = 2;
var RESTART_MODE_NEVER = 3;
@@ -4885,7 +4883,6 @@ aRestartModeOutMap = [ 'inherit','always',
'whenNotActive', 'never' ];
// Fill Modes
var FILL_MODE_DEFAULT = 0;
-var FILL_MODE_INHERIT = 0;
var FILL_MODE_REMOVE = 1;
var FILL_MODE_FREEZE = 2;
var FILL_MODE_HOLD = 3;
@@ -4905,7 +4902,6 @@ aFillModeOutMap = [ 'inherit', 'remove', 'freeze',
'hold', 'transition', 'auto'
// Additive Modes
-var ADDITIVE_MODE_UNKNOWN = 0;
var ADDITIVE_MODE_BASE = 1;
var ADDITIVE_MODE_SUM = 2;
var ADDITIVE_MODE_REPLACE = 3;
@@ -4930,7 +4926,6 @@ var ACCUMULATE_MODE_SUM = 1;
aAccumulateModeOutMap = [ 'none', 'sum' ];
// Calculation Modes
-var CALC_MODE_UNKNOWN = 0
var CALC_MODE_DISCRETE = 1;
var CALC_MODE_LINEAR = 2;
var CALC_MODE_PACED = 3;
@@ -6374,17 +6369,17 @@ function getTransitionTable( eRestartMode, eFillMode )
// Event Triggers
var EVENT_TRIGGER_UNKNOWN = 0;
-var EVENT_TRIGGER_ON_SLIDE_BEGIN = 1;
-var EVENT_TRIGGER_ON_SLIDE_END = 2;
+var EVENT_TRIGGER_ON_SLIDE_BEGIN = 1; // TODO
+var EVENT_TRIGGER_ON_SLIDE_END = 2; // TODO
var EVENT_TRIGGER_BEGIN_EVENT = 3;
var EVENT_TRIGGER_END_EVENT = 4;
var EVENT_TRIGGER_ON_CLICK = 5;
-var EVENT_TRIGGER_ON_DBL_CLICK = 6;
-var EVENT_TRIGGER_ON_MOUSE_ENTER = 7;
-var EVENT_TRIGGER_ON_MOUSE_LEAVE = 8;
+var EVENT_TRIGGER_ON_DBL_CLICK = 6; // TODO
+var EVENT_TRIGGER_ON_MOUSE_ENTER = 7; // TODO
+var EVENT_TRIGGER_ON_MOUSE_LEAVE = 8; // TODO
var EVENT_TRIGGER_ON_NEXT_EFFECT = 9;
var EVENT_TRIGGER_ON_PREV_EFFECT = 10;
-var EVENT_TRIGGER_REPEAT = 11;
+var EVENT_TRIGGER_REPEAT = 11; // TODO
aEventTriggerOutMap = [ 'unknown', 'slideBegin', 'slideEnd', 'begin', 'end',
'click',
'doubleClick', 'mouseEnter', 'mouseLeave', 'next',
'previous', 'repeat' ];
@@ -6413,11 +6408,11 @@ function getEventTriggerType( sEventTrigger )
// Timing Types
var UNKNOWN_TIMING = 0;
var OFFSET_TIMING = 1;
-var WALLCLOCK_TIMING = 2;
+var WALLCLOCK_TIMING = 2; // TODO
var INDEFINITE_TIMING = 3;
var EVENT_TIMING = 4;
var SYNCBASE_TIMING = 5;
-var MEDIA_TIMING = 6;
+var MEDIA_TIMING = 6; // TODO
aTimingTypeOutMap = [ 'unknown', 'offset', 'wallclock', 'indefinite', 'event',
'syncbase', 'media' ];
@@ -14556,13 +14551,6 @@ function createActivity( aActivityParamSet,
aAnimationNode, aAnimation, aInterpo
sFormula = sFormula.replace(/e(?!\w)/g, 'Math.E');
sFormula = sFormula.replace(/\$/g, '__PARAM0__');
- var aAnimatedElement = aAnimationNode.getAnimatedElement();
- var aBBox = aAnimatedElement.getBaseBBox();
- var width = aBBox.width / aActivityParamSet.nSlideWidth;
- var height = aBBox.height / aActivityParamSet.nSlideHeight;
- var x = ( aBBox.x + aBBox.width / 2 ) / aActivityParamSet.nSlideWidth;
- var y = ( aBBox.y + aBBox.height / 2 ) /
aActivityParamSet.nSlideHeight;
-
aActivityParamSet.aFormula = function( ) {
return eval(sFormula);
@@ -14770,11 +14758,6 @@ function extractAttributeValues( eValueType,
aValueList, aValueSet, aBBox, nSlid
function evalValuesAttribute( aValueList, aValueSet, aBBox, nSlideWidth,
nSlideHeight )
{
- var width = aBBox.width / nSlideWidth;
- var height = aBBox.height / nSlideHeight;
- var x = ( aBBox.x + aBBox.width / 2 ) / nSlideWidth;
- var y = ( aBBox.y + aBBox.height / 2 ) / nSlideHeight;
-
var reMath = /abs|sqrt|asin|acos|atan|sin|cos|tan|exp|log|min|max/g;
for( var i = 0; i < aValueSet.length; ++i )
commit f1d3dbd59ebe3ce054549fcf13bcd379193a0012
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 03:24:40 2017 +0200
svg filter: remove reams of commented-out JS code
Change-Id: I620bb3ee72653ecc595c5da9fe0558defaf96a44
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index bc39c1cf535d..7109d77b9892 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -319,7 +319,6 @@ function mouseHandlerDispatch( aEvt, anAction )
//Set mouse event handler.
document.onmouseup = function( aEvt ) { return mouseHandlerDispatch( aEvt,
MOUSE_UP ); };
-//document.onmousemove = function( aEvt ) { return mouseHandlerDispatch( aEvt,
MOUSE_MOVE ); };
/** mouseClickHelper
@@ -1921,11 +1920,6 @@ function getNSAttribute( sNSPrefix, aElem, sAttrName )
{
return aElem.getAttribute( sNSPrefix + ':' + sAttrName );
}
-// if( aElem.hasAttributeNS( NSS[sNSPrefix], sAttrName ) )
-// {
-// return aElem.getAttributeNS( NSS[sNSPrefix], sAttrName );
-// }
-// return null;
}
function getOOOAttribute( aElem, sAttrName )
@@ -2345,8 +2339,6 @@ function MetaSlide( sMetaSlideId, aMetaDoc )
if( this.bHasTransition )
{
this.aTransitionHandler = new SlideTransition(
this.getSlideAnimationsRoot(), this.slideId );
- //if( this.aTransitionHandler.isValid() )
- // log( this.aTransitionHandler.info() );
}
// We initialize the SlideAnimationsHandler object
@@ -2510,7 +2502,6 @@ collectTextShapes : function()
var sTextShapeIds = getOOOAttribute( aIndexEntryList[i],
'id-list' );
if( sTextShapeIds )
{
- //log( 'slide id: ' + this.slideId + ' text shape id list:
' + sTextShapeIds );
var aTextShapeIdSet = sTextShapeIds.split( ' ' );
var j;
for( j = 0; j < aTextShapeIdSet.length; ++j )
@@ -2552,7 +2543,6 @@ initHyperlinks : function()
for( j = 0; j < aHyperlinkIdSet.length; ++j )
{
var sId = aHyperlinkIdSet[j];
- //log( 'initHyperlinks: j=' + j + ' id: <' + sId + '>'
);
aHyperlinkSet[ sId ] = new HyperlinkElement( sId,
this.aSlideAnimationsHandler.aEventMultiplexer );
}
}
@@ -3388,9 +3378,7 @@ function SlideIndexPage()
this.aThumbnailSet[i].updateView();
}
-// this.curThumbnailIndex = this.selectedSlideIndex % this.totalThumbnails;
this.curThumbnailIndex = 0;
-// this.aThumbnailSet[ this.curThumbnailIndex ].select();
}
@@ -3582,8 +3570,6 @@ function Thumbnail( aSlideIndexPage, nIndex )
this.slideElement = getElementByClassName( this.thumbnailElement, 'Slide'
);
this.borderElement = getElementByClassName( this.thumbnailElement,
'Border' );
this.mouseAreaElement = getElementByClassName( this.thumbnailElement,
'MouseArea' );
- //this.mouseAreaElement.setAttribute( 'onmouseover',
'theSlideIndexPage.aThumbnailSet[' + this.index + '].onMouseOver()' );
- //this.mouseAreaElement.onmousedown =
mouseHandlerDictionary[INDEX_MODE][MOUSE_DOWN];
this.aTransformSet = new Array( 3 );
this.visibility = VISIBLE;
this.isSelected = false;
@@ -3752,30 +3738,6 @@ function init()
aSlideShow.bIsEnabled = theMetaDoc.bIsAnimated;
theSlideIndexPage = new SlideIndexPage();
aSlideShow.displaySlide( theMetaDoc.nStartSlideNumber, false );
-
- //=====================================//
- // ===== timing test ===== //
- //=====================================//
-// var aTimingAttributeList = [ '0.001s', '-12:16.123', 'next',
'id23.click', 'id3.end + 5s', 'id4.begin - 12:45' ];
-//
-// for( var i = 0; i < aTimingAttributeList.length; ++i)
-// {
-// var aTiming = new Timing( aTimingAttributeList[i] );
-// aTiming.parse();
-// aTiming.info();
-// }
-
-
-
- // == animations parsing test ==
-
-
-// var aSlideShowContext = aSlideShow.getContext();
-// var aSlideAnimations = new SlideAnimations( aSlideShowContext );
-// aSlideAnimations.importAnimations( getSlideAnimationsRoot( 'id7' ) );
-// aSlideAnimations.parseElements();
-// log( aSlideAnimations.aRootNode.info( true ) );
-
}
function presentationEngineStop()
@@ -3882,8 +3844,6 @@ function displayIndex( offsetNumber )
*/
function toggleSlideIndex()
{
- //var suspendHandle = ROOT_NODE.suspendRedraw(500);
-
if( currentMode == SLIDE_MODE )
{
@@ -3901,9 +3861,6 @@ function toggleSlideIndex()
aSlideShow.displaySlide( nNewSlide, true );
currentMode = SLIDE_MODE;
}
-
- //ROOT_NODE.unsuspendRedraw(suspendHandle);
- //ROOT_NODE.forceRedraw();
}
/** Function that exit from the index mode without changing the shown slide
@@ -4021,7 +3978,6 @@ function bind2( aFunction )
function getCurrentSystemTime()
{
return ( new Date() ).getTime();
- //return ROOT_NODE.getCurrentTime();
}
/** This function return an array populated with all children nodes of the
@@ -4839,7 +4795,6 @@ aAnimationNodeTypeInMap = {
function getAnimationElementType( aElement )
{
var sName = aElement.localName.toLowerCase();
- //log( 'getAnimationElementType: ' + sName );
if( sName && aAnimationNodeTypeInMap[ sName ] )
return aAnimationNodeTypeInMap[ sName ];
@@ -7570,9 +7525,6 @@ AnimationBaseNode.prototype.activate_st = function()
{
AnimationBaseNode.superclass.scheduleDeactivationEvent.call( this );
}
-
- // TODO: only for testing! to be removed!
- //AnimationBaseNode.superclass.scheduleDeactivationEvent.call( this );
};
AnimationBaseNode.prototype.deactivate_st = function( eDestState )
@@ -8407,7 +8359,6 @@ SequentialTimeContainer.prototype.rewindLastEffect =
function( aChildNode )
// lately we noticed that when interactive animation sequences are
// involved into the shape effect invoking such a method causes
// some issue.
- //aChildNode.removeEffect();
// As we rewind the previous effect we need to decrease the finished
// children counter.
@@ -8516,79 +8467,6 @@ extend( PropertyAnimationNode, AnimationBaseNode3 );
PropertyAnimationNode.prototype.createActivity = function()
{
-
- /*
- var aActivityParamSet = this.fillActivityParams();
- var aAnimation = createPropertyAnimation( 'opacity',
- this.getAnimatedElement(),
- this.aNodeContext.aSlideWidth,
- this.aNodeContext.aSlideHeight );
-
- return new SimpleActivity( aActivityParamSet, aAnimation, FORWARD );
- */
-
-
- /*
- if( true && this.getAttributeName() === 'x' )
- {
- var sAttributeName = 'x';
-
- this.aDuration = new Duration( '2s' );
- this.sAttributeName = sAttributeName;
- this.aKeyTimes = [ 0.0, 0.25, 0.50, 0.75, 1.0 ];
- //this.aKeyTimes = [ 0.0, 1.0 ];
- var aM = 5000 / this.aNodeContext.aSlideWidth;
- this.aValues = [ 'x', 'x - ' + aM, 'x', 'x + ' + aM, 'x' ];
- //this.aValues = [ '0', 'width' ];
-
- //this.aFromValue = '';
- //this.aToValue = '0 + ' + aTranslationValue;
- //this.aByValue = aTranslationValue;
- //this.nRepeatCount = 3;
-
- var aActivityParamSet = this.fillActivityParams();
-
- var aAnimation = createPropertyAnimation( this.getAttributeName(),
-
this.getAnimatedElement(),
-
this.aNodeContext.aSlideWidth,
-
this.aNodeContext.aSlideHeight );
-
- var aInterpolator = null;
- return createActivity( aActivityParamSet, this, aAnimation,
aInterpolator );
- }
-
- if( true && this.getAttributeName() === 'y' )
- {
- var sAttributeName = 'height';
- this.aDuration = new Duration( '2s' );
- this.sAttributeName = sAttributeName;
- this.aKeyTimes = [ 0.0, 0.25, 0.50, 0.75, 1.0 ];
- //this.aKeyTimes = [ 0.0, 1.0 ];
- var aM = 5000 / this.aNodeContext.aSlideHeight;
- this.aValues = new Array();
- //this.aValues = [ 'y', 'y', 'y - ' + aM, 'y - ' + aM, 'y' ];
- this.aValues = [ 'height', '0', 'height', '2*height', 'height' ];
- //this.aValues = [ '0', 'height' ];
-
- //this.aFromValue = '2 * height';
- //this.aToValue = 'width';
- //this.aByValue = 'width';//aTranslationValue;
-
-
- var aActivityParamSet = this.fillActivityParams();
-
- var aAnimation = createPropertyAnimation( this.getAttributeName(),
-
this.getAnimatedElement(),
-
this.aNodeContext.aSlideWidth,
-
this.aNodeContext.aSlideHeight );
-
- var aInterpolator = null;
- return createActivity( aActivityParamSet, this, aAnimation,
aInterpolator );
- }
- */
-
-
-
var aActivityParamSet = this.fillActivityParams();
var aAnimation = createPropertyAnimation( this.getAttributeName(),
@@ -8598,7 +8476,6 @@ PropertyAnimationNode.prototype.createActivity =
function()
var aInterpolator = null; // createActivity will compute it;
return createActivity( aActivityParamSet, this, aAnimation, aInterpolator
);
-
};
@@ -8663,67 +8540,6 @@ AnimationColorNode.prototype.parseElement = function()
AnimationColorNode.prototype.createActivity = function()
{
- /*
- var aActivityParamSet = this.fillActivityParams();
-
- var aAnimation = createPropertyAnimation( 'opacity',
- this.getAnimatedElement(),
- this.aNodeContext.aSlideWidth,
- this.aNodeContext.aSlideHeight );
-
- return new SimpleActivity( aActivityParamSet, aAnimation, FORWARD );
- */
-
- /*
- if( false && this.getAttributeName() === 'fill-color' )
- {
- var sAttributeName = 'stroke-color';
-
- this.aDuration = new Duration( '2s' );
- this.nAccelerate = 0.0;
- this.nDecelerate = 0.0;
- this.eColorInterpolation = COLOR_SPACE_RGB;
- this.eColorInterpolationDirection = COUNTERCLOCKWISE;
-
- this.sAttributeName = sAttributeName;
-
- this.aFromValue = 'rgb( 0%, 0%, 0% )';
- this.aToValue = 'rgb( 0%, 0%, 100% )';
- //this.aByValue = 'hsl( 0, -12%, -25% )';
-
-
-
- var aActivityParamSet = this.fillActivityParams();
-
- var aAnimation = createPropertyAnimation( this.getAttributeName(),
- this.getAnimatedElement(),
-
this.aNodeContext.aSlideWidth,
-
this.aNodeContext.aSlideHeight );
- var aColorAnimation;
- var aInterpolator;
- if( this.getColorInterpolation() === COLOR_SPACE_HSL )
- {
- ANIMDBG.print( 'AnimationColorNode.createActivity: color space
hsl' );
- aColorAnimation = new HSLAnimationWrapper( aAnimation );
- var aInterpolatorMaker = aInterpolatorHandler.getInterpolator(
this.getCalcMode(),
-
COLOR_PROPERTY,
-
COLOR_SPACE_HSL );
- aInterpolator = aInterpolatorMaker(
this.getColorInterpolationDirection() );
- }
- else
- {
- ANIMDBG.print( 'AnimationColorNode.createActivity: color space
rgb' );
- aColorAnimation = aAnimation;
- aInterpolator = aInterpolatorHandler.getInterpolator(
this.getCalcMode(),
-
COLOR_PROPERTY,
-
COLOR_SPACE_RGB );
- }
-
- return createActivity( aActivityParamSet, this, aColorAnimation,
aInterpolator );
- }
- */
-
-
var aActivityParamSet = this.fillActivityParams();
var aAnimation = createPropertyAnimation( this.getAttributeName(),
@@ -8752,8 +8568,6 @@ AnimationColorNode.prototype.createActivity = function()
}
return createActivity( aActivityParamSet, this, aColorAnimation,
aInterpolator );
-
-
};
AnimationColorNode.prototype.getColorInterpolation = function()
@@ -8957,16 +8771,12 @@ function createAnimationNode( aElement, aParentNode,
aNodeContext )
aCreatedNode = new AnimationSetNode( aElement, aParentNode,
aNodeContext );
break;
case ANIMATION_NODE_ANIMATEMOTION:
- //aCreatedNode = new AnimationPathMotionNode( aElement,
aParentNode, aNodeContext );
- //break;
log( 'createAnimationNode: ANIMATEMOTION not implemented' );
return null;
case ANIMATION_NODE_ANIMATECOLOR:
aCreatedNode = new AnimationColorNode( aElement, aParentNode,
aNodeContext );
break;
case ANIMATION_NODE_ANIMATETRANSFORM:
- //aCreatedNode = new AnimationTransformNode( aElement,
aParentNode, aNodeContext );
- //break;
log( 'createAnimationNode: ANIMATETRANSFORM not implemented' );
return null;
case ANIMATION_NODE_TRANSITIONFILTER:
@@ -9819,7 +9629,6 @@ ClippingFunctor.prototype.perform = function( nT, nWidth,
nHeight )
if( this.bScaleIsotropically )
{
var nScaleFactor = Math.max( nWidth, nHeight );
- // translate( scale( aStaticTransformation() ) )
// note: operations must be defined in reverse order.
aMatrix = SVGIdentityMatrix.translate( -( nScaleFactor - nWidth ) /
2.0,
-( nScaleFactor - nHeight )
/ 2.0 );
@@ -11234,8 +11043,6 @@ AnimatedSlide.prototype.setClipPath = function(
aClipPathContent )
// anyway that does not work in IE9, so we replace the 'd' attribute, only.
if( this.aClipPathContent )
{
-// this.aClipPathElement.replaceChild( aClipPathContent,
this.aClipPathContent );
-// this.aClipPathContent = aClipPathContent;
var sPathData = aClipPathContent.getAttribute( 'd' );
this.aClipPathContent.setAttribute( 'd', sPathData );
}
@@ -12925,7 +12732,6 @@ function HyperlinkElement( sId, aEventMultiplexer )
HyperlinkElement.prototype.onElementChanged = function( aElement )
{
- //var aElement = document.getElementById( this.sId );
if( !aElement )
{
log( 'error: HyperlinkElement: passed element is not valid' );
@@ -12958,8 +12764,6 @@ HyperlinkElement.prototype.handleClick = function( )
{
if( !this.bIsPointerOver ) return false;
- //log( 'hyperlink: ' + this.sURL );
-
if( this.nTargetSlideIndex !== undefined )
{
aSlideShow.displaySlide( this.nTargetSlideIndex, true );
@@ -14332,7 +14136,6 @@ SimpleActivity.prototype.performContinuousHook =
function( nModifiedTime )
return;
var nT = 1.0 - this.nDirection + nModifiedTime * ( 2.0*this.nDirection -
1.0 );
- //ANIMDBG.print( 'SimpleActivity.performContinuousHook: nT = ' + nT );
this.aAnimation.perform( nT );
};
@@ -14377,9 +14180,6 @@ function FromToByActivityTemplate( BaseType ) //
template parameter
this.nIteration = 0;
this.bCumulative = bAccumulate;
this.aFormula = aActivityParamSet.aFormula;
-
- //this.initAnimatedElement();
-
}
extend( FromToByActivity, BaseType );
@@ -14428,7 +14228,6 @@ function FromToByActivityTemplate( BaseType ) //
template parameter
// From-By animation
this.aStartValue = this.aFrom;
- // this.aEndValue = this.aStartValue + this.aBy;
this.aEndValue = this.add( this.aStartValue, this.aBy );
}
}
@@ -14457,7 +14256,6 @@ function FromToByActivityTemplate( BaseType ) //
template parameter
// By animation
this.aStartValue = aAnimationStartValue;
- // this.aEndValue = this.aStartValue + this.aBy;
this.aEndValue = this.add( this.aStartValue, this.aBy );
}
}
@@ -14524,7 +14322,6 @@ function FromToByActivityTemplate( BaseType ) //
template parameter
// the target attribute, cumulative animation is not defined.
if( this.bCumulative && !this.bDynamicStartValue )
{
- // aValue = this.aEndValue * nRepeatCount + aValue;
aValue = this.add( this.scale( nRepeatCount, this.aEndValue ),
aValue );
}
@@ -14601,8 +14398,6 @@ function ValueListActivityTemplate( BaseType ) //
template parameter
this.bCumulative = bAccumulate;
this.aLastValue = this.aValueList[ this.aValueList.length - 1 ];
this.aFormula = aActivityParamSet.aFormula;
-
- //this.initAnimatedElement();
}
extend( ValueListActivity, BaseType );
@@ -14613,8 +14408,6 @@ function ValueListActivityTemplate( BaseType ) //
template parameter
{
ANIMDBG.print( 'createValueListActivity: value[' + i + '] = ' +
this.aValueList[i] );
}
-
- //this.initAnimatedElement();
};
ValueListActivity.prototype.initAnimatedElement = function()
@@ -14667,7 +14460,6 @@ function ValueListActivityTemplate( BaseType ) //
template parameter
if( this.bCumulative )
{
aValue = this.add( aValue, this.scale( nRepeatCount,
this.aLastValue ) );
- //aValue = aValue + nRepeatCount * this.aLastValue;
}
aValue = this.aFormula ? this.aFormula( aValue ) : aValue;
@@ -15752,7 +15544,6 @@ SlideShow.prototype.displaySlide = function( nNewSlide,
bSkipSlideTransition )
SlideShow.prototype.update = function()
{
this.aTimer.holdTimer();
- //var suspendHandle = ROOT_NODE.suspendRedraw( PREFERRED_FRAME_RATE * 1000
);
// process queues
this.aTimerEventQueue.process();
@@ -15762,8 +15553,6 @@ SlideShow.prototype.update = function()
this.aActivityQueue.processDequeued();
- //ROOT_NODE.unsuspendRedraw(suspendHandle);
- //ROOT_NODE.forceRedraw();
this.aTimer.releaseTimer();
var bActivitiesLeft = ( ! this.aActivityQueue.isEmpty() );
@@ -16262,18 +16051,10 @@ ElapsedTime.prototype.getCurrentTime = function()
if ( !this.aTimeBase )
{
nCurrentTime = this.getSystemTime();
-// if( !isFinite(nCurrentTime) )
-// {
-// log( 'ElapsedTime.getCurrentTime: this.getSystemTime() == '
+ nCurrentTime );
-// }
}
else
{
nCurrentTime = this.aTimeBase.getElapsedTimeImpl();
-// if( !isFinite(nCurrentTime) )
-// {
-// log( 'ElapsedTime.getCurrentTime:
this.aTimeBase.getElapsedTimeImpl() == ' + nCurrentTime );
-// }
}
assert( ( typeof( nCurrentTime ) === typeof( 0 ) ) && isFinite(
nCurrentTime ),
@@ -16287,11 +16068,6 @@ ElapsedTime.prototype.getElapsedTimeImpl = function()
{
if( this.bInHoldMode || this.bInPauseMode )
{
-// if( !isFinite(this.nFrozenTime) )
-// {
-// log( 'ElapsedTime.getElapsedTimeImpl: nFrozenTime == ' +
this.nFrozenTime );
-// }
-
return this.nFrozenTime;
}
commit d167f393c85f7568bcd79a5d7da2066f094f400d
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Mon Apr 17 03:06:21 2017 +0200
svg filter: fix eslint no-unused-vars errors
Change-Id: I1ef6d22f21069afd8dcef5842cf819ca2fef5287
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index c705af7c2c98..bc39c1cf535d 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -401,19 +401,13 @@ function getDefaultMouseHandlerDictionary()
// slide mode
mouseHandlerDict[SLIDE_MODE][MOUSE_UP]
= mouseClickHelper;
- //= function( aEvt ) { return slideOnMouseDown( aEvt ); };
-// = function( aEvt ) { return ( aSlideShow.aEventMultiplexer ) ?
-//
aSlideShow.aEventMultiplexer.notifyMouseClick( aEvt )
-// : slideOnMouseUp( aEvt ); };
mouseHandlerDict[SLIDE_MODE][MOUSE_WHEEL]
= function( aEvt ) { return slideOnMouseWheel( aEvt ); };
// index mode
mouseHandlerDict[INDEX_MODE][MOUSE_UP]
- = function( aEvt ) { return toggleSlideIndex(); };
-// mouseHandlerDict[INDEX_MODE][MOUSE_MOVE]
-// = function( aEvt ) { return theSlideIndexPage.updateSelection( aEvt
); };
+ = function( ) { return toggleSlideIndex(); };
return mouseHandlerDict;
}
@@ -1129,7 +1123,7 @@ function configureDetectionTools()
};
// When a path segment changes the list needs to be synchronized back
to the path element.
- SVGPathSegList.prototype.segmentChanged = function(pathSeg) {
+ SVGPathSegList.prototype.segmentChanged = function() {
this._writeListToPath();
};
@@ -1916,13 +1910,6 @@ function log( message )
}
}
-function warning( bCondition, sMessage )
-{
- if( bCondition )
- log( sMessage );
- return bCondition;
-}
-
function getNSAttribute( sNSPrefix, aElem, sAttrName )
{
if( !aElem ) return null;
@@ -1961,17 +1948,6 @@ function setNSAttribute( sNSPrefix, aElem, sAttrName,
aValue )
}
}
-function setOOOAttribute( aElem, sAttrName, aValue )
-{
- return setNSAttribute( 'ooo', aElem, sAttrName, aValue );
-}
-
-function checkElemAndSetAttribute( aElem, sAttrName, aValue )
-{
- if( aElem )
- aElem.setAttribute( sAttrName, aValue );
-}
-
function getElementsByClassName( aElem, sClassName )
{
@@ -2048,16 +2024,6 @@ function initVisibilityProperty( aElement )
return nVisibility;
}
-function setElementVisibility( aElement, nCurrentVisibility, nNewVisibility )
-{
- if( nCurrentVisibility != nNewVisibility )
- {
- checkElemAndSetAttribute( aElement, 'visibility',
aVisibilityAttributeValue[nNewVisibility] );
- return nNewVisibility;
- }
- return nCurrentVisibility;
-}
-
function getSafeIndex( nIndex, nMin, nMax )
{
if( nIndex < nMin )
@@ -2079,15 +2045,6 @@ function getRandomInt( nMax )
return Math.floor( Math.random() * nMax );
}
-function isTextFieldElement( aElement )
-{
- var sClassName = aElement.getAttribute( 'class' );
- return ( sClassName === aSlideNumberClassName ) ||
- ( sClassName === aFooterClassName ) ||
- ( sClassName === aHeaderClassName ) ||
- ( sClassName === aDateTimeClassName );
-}
-
/*********************
** Debug Utilities **
@@ -3316,7 +3273,7 @@ CurrentDateTimeProvider.prototype.update = function(
aDateTimeField )
/*** private methods ***/
-CurrentDateTimeProvider.prototype.createDateTimeText = function(
sDateTimeFormat )
+CurrentDateTimeProvider.prototype.createDateTimeText = function()
{
// TODO handle date/time format
var aDate = new Date();
@@ -3374,7 +3331,7 @@ SlideNumberProvider.prototype.update = function(
aSlideNumberField, nSlideNumber
/*** private methods ***/
-SlideNumberProvider.prototype.createSlideNumberText = function( nSlideNumber,
sNumberingType )
+SlideNumberProvider.prototype.createSlideNumberText = function( nSlideNumber )
{
// TODO handle page numbering type
return String( nSlideNumber );
@@ -3717,7 +3674,7 @@ Thumbnail.prototype.update = function( nIndex )
this.slideIndex = nIndex;
};
-Thumbnail.prototype.clear = function( nIndex )
+Thumbnail.prototype.clear = function( )
{
setNSAttribute( 'xlink', this.slideElement, 'href', '' );
};
@@ -4067,11 +4024,6 @@ function getCurrentSystemTime()
//return ROOT_NODE.getCurrentTime();
}
-function getSlideAnimationsRoot( sSlideId )
-{
- return theMetaDoc.aSlideAnimationsMap[ sSlideId ];
-}
-
/** This function return an array populated with all children nodes of the
* passed element that are elements
*
@@ -4134,29 +4086,9 @@ function makeMatrixString( a, b, c, d, e, f )
return s;
}
-function matrixToString( aSVGMatrix )
-{
- return makeMatrixString( aSVGMatrix.a, aSVGMatrix.b, aSVGMatrix.c,
- aSVGMatrix.d, aSVGMatrix.e, aSVGMatrix.f );
-}
-
-
-
// Attribute Parsers
-function numberParser( sValue )
-{
- if( sValue === '.' )
- return undefined;
- var reFloatNumber = /^[+-]?[0-9]*[.]?[0-9]*$/;
-
- if( reFloatNumber.test( sValue ) )
- return parseFloat( sValue );
- else
- return undefined;
-}
-
function booleanParser( sValue )
{
sValue = sValue.toLowerCase();
@@ -4170,22 +4102,6 @@ function booleanParser( sValue )
function colorParser( sValue )
{
-
- function hsl( nHue, nSaturation, nLuminance )
- {
- return new HSLColor( nHue, nSaturation / 100, nLuminance / 100 );
- }
-
- function rgb( nRed, nGreen, nBlue )
- {
- return new RGBColor( nRed / 255, nGreen / 255, nBlue / 255 );
- }
-
- function prgb( nRed, nGreen, nBlue )
- {
- return new RGBColor( nRed / 100, nGreen / 100, nBlue / 100 );
- }
-
var sCommaPattern = ' *[,] *';
var sIntegerPattern = '[+-]?[0-9]+';
var sHexDigitPattern = '[0-9A-Fa-f]';
@@ -7377,7 +7293,7 @@ BaseNode.prototype.activate_st = function()
this.scheduleDeactivationEvent();
};
-BaseNode.prototype.deactivate_st = function( aNodeState )
+BaseNode.prototype.deactivate_st = function( )
{
// empty body
};
@@ -8116,7 +8032,7 @@ BaseContainerNode.prototype.activate_st = function()
log( 'BaseContainerNode.activate_st: abstract method called' );
};
-BaseContainerNode.prototype.notifyDeactivating = function( aAnimationNode )
+BaseContainerNode.prototype.notifyDeactivating = function( )
{
log( 'BaseContainerNode.notifyDeactivating: abstract method called' );
};
@@ -9112,7 +9028,7 @@ function createChildNode( aElement, aParentNode,
aNodeContext )
-function createIteratedNodes( aElement, aContainerNode, aNodeContext )
+function createIteratedNodes( )
{
// not implemented
}
@@ -9124,7 +9040,6 @@ function createIteratedNodes( aElement, aContainerNode,
aNodeContext )
**********************************************************************************************/
-
function makeScaler( nScale )
{
if( ( typeof( nScale ) !== typeof( 0 ) ) || !isFinite( nScale ) )
@@ -9142,7 +9057,7 @@ function makeScaler( nScale )
-function createPropertyAnimation( sAttrName, aAnimatedElement, nWidth, nHeight
)
+function createPropertyAnimation( sAttrName, aAnimatedElement )
{
if( !aAttributeMap[ sAttrName ] )
{
@@ -9469,12 +9384,12 @@ SlideChangeBase.prototype.getUnderlyingValue =
function()
return 0.0;
};
-SlideChangeBase.prototype.performIn = function( nValue )
+SlideChangeBase.prototype.performIn = function( )
{
log( 'SlideChangeBase.performIn: abstract method called' );
};
-SlideChangeBase.prototype.performOut = function( nValue )
+SlideChangeBase.prototype.performOut = function( )
{
log( 'SlideChangeBase.performOut: abstract method called' );
};
@@ -9756,7 +9671,7 @@ ClippedSlideChange.prototype.performIn = function( nT )
this.aEnteringSlide.setClipPath( aPolyPolygonElement );
};
-ClippedSlideChange.prototype.performOut = function( nT )
+ClippedSlideChange.prototype.performOut = function( )
{
// empty body
};
@@ -11487,7 +11402,7 @@ AnimatedElement.prototype.notifyAnimationEnd =
function()
// empty body
};
-AnimatedElement.prototype.notifyNextEffectStart = function( nEffectIndex )
+AnimatedElement.prototype.notifyNextEffectStart = function( )
{
// empty body
};
@@ -11661,7 +11576,6 @@ AnimatedElement.prototype.getHeight = function()
AnimatedElement.prototype.updateTransformAttribute = function()
{
- //this.aActiveElement.setAttribute( 'transform', matrixToString(
this.aTMatrix ) );
this.aTransformAttrList = this.aActiveElement.transform.baseVal;
this.aTransformAttr = this.aTransformAttrList.getItem( 0 );
this.aTransformAttr.setMatrix( this.aTMatrix );
@@ -12935,7 +12849,7 @@ SourceEventElement.prototype.charge = function()
this.setPointerCursor();
};
-SourceEventElement.prototype.handleClick = function( aMouseEvent )
+SourceEventElement.prototype.handleClick = function( )
{
if( !this.bIsPointerOver ) return false;
@@ -13040,7 +12954,7 @@ HyperlinkElement.prototype.onMouseLeave = function()
this.setDefaultCursor();
};
-HyperlinkElement.prototype.handleClick = function( aMouseEvent )
+HyperlinkElement.prototype.handleClick = function( )
{
if( !this.bIsPointerOver ) return false;
@@ -13616,7 +13530,7 @@ aOperatorSetMap[ ENUM_PROPERTY ].equal = function( a, b
)
return ( a === b );
};
-aOperatorSetMap[ ENUM_PROPERTY ].add = function( a, b )
+aOperatorSetMap[ ENUM_PROPERTY ].add = function( a )
{
return a;
};
@@ -14029,7 +13943,7 @@ DiscreteActivityBase.prototype.calcRepeatCount =
function( nCurrCalls, nVectorSi
}
};
-DiscreteActivityBase.prototype.performDiscreteHook = function( nFrame,
nRepeatCount )
+DiscreteActivityBase.prototype.performDiscreteHook = function( )
{
throw ( 'DiscreteActivityBase.performDiscreteHook: abstract method
invoked' );
};
@@ -14304,7 +14218,7 @@ SimpleContinuousActivityBase.prototype.perform =
function()
return this.isActive();
};
-SimpleContinuousActivityBase.prototype.simplePerform = function( nSimpleTime,
nRepeatCount )
+SimpleContinuousActivityBase.prototype.simplePerform = function( )
{
throw ( 'SimpleContinuousActivityBase.simplePerform: abstract method
invoked' );
};
@@ -14338,7 +14252,7 @@ ContinuousKeyTimeActivityBase.prototype.activate =
function( aEndElement )
this.aLerper.reset();
};
-ContinuousKeyTimeActivityBase.prototype.performContinuousHook = function(
nIndex, nFractionalIndex, nRepeatCount )
+ContinuousKeyTimeActivityBase.prototype.performContinuousHook = function( )
{
throw ( 'ContinuousKeyTimeActivityBase.performContinuousHook: abstract
method invoked' );
};
@@ -14363,7 +14277,7 @@ function ContinuousActivityBase( aCommonParamSet )
extend( ContinuousActivityBase, SimpleContinuousActivityBase );
-ContinuousActivityBase.prototype.performContinuousHook = function(
nModifiedTime, nRepeatCount )
+ContinuousActivityBase.prototype.performContinuousHook = function( )
{
throw ( 'ContinuousActivityBase.performContinuousHook: abstract method
invoked' );
};
@@ -14410,7 +14324,7 @@ SimpleActivity.prototype.endAnimation = function()
};
-SimpleActivity.prototype.performContinuousHook = function( nModifiedTime,
nRepeatCount )
+SimpleActivity.prototype.performContinuousHook = function( nModifiedTime )
{
// nRepeatCount is not used
@@ -14625,7 +14539,7 @@ function FromToByActivityTemplate( BaseType ) //
template parameter
};
// perform hook override for DiscreteActivityBase
- FromToByActivity.prototype.performDiscreteHook = function( nFrame,
nRepeatCount )
+ FromToByActivity.prototype.performDiscreteHook = function( )
{
if (this.isDisposed() || !this.aAnimation) {
log('FromToByActivity.performDiscreteHook: activity disposed or
not valid animation');
@@ -14857,7 +14771,7 @@ function createActivity( aActivityParamSet,
aAnimationNode, aAnimation, aInterpo
var x = ( aBBox.x + aBBox.width / 2 ) / aActivityParamSet.nSlideWidth;
var y = ( aBBox.y + aBBox.height / 2 ) /
aActivityParamSet.nSlideHeight;
- aActivityParamSet.aFormula = function( __PARAM0__ ) {
+ aActivityParamSet.aFormula = function( ) {
return eval(sFormula);
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
