commit 8bde434b5a6a1bc35892e2abbbd9a555203b2096
author airnan <hernantorrisi@gmail.com> Sat May 18 06:37:25 2019 -0400
committer airnan <hernantorrisi@gmail.com> Sat May 18 06:37:25 2019 -0400
tree 9bf9a8ea21875e14385ab54225df43d34f7b8938
parent 662606d20e020a9bf137e518592da69a17ae2972

added support for mask opacity in expressions

player/js/mask.js

diff --git a/player/js/mask.js b/player/js/mask.js
index a7d694a..7100a3a 100644
--- a/player/js/mask.js
+++ b/player/js/mask.js
@@ -19,8 +19,7 @@
     var rect, expansor, feMorph,x;
     var maskType = 'clipPath', maskRef = 'clip-path';
     for (i = 0; i < len; i++) {
-
-        if((properties[i].mode !== 'a' && properties[i].mode !== 'n')|| properties[i].inv || properties[i].o.k !== 100){
+        if((properties[i].mode !== 'a' && properties[i].mode !== 'n')|| properties[i].inv || properties[i].o.k !== 100 || properties[i].o.x){
             maskType = 'mask';
             maskRef = 'mask';
         }

player/js/utils/expressions/MaskInterface.js

diff --git a/player/js/utils/expressions/MaskInterface.js b/player/js/utils/expressions/MaskInterface.js
index fafeaaf..477c021 100644
--- a/player/js/utils/expressions/MaskInterface.js
+++ b/player/js/utils/expressions/MaskInterface.js
@@ -6,12 +6,20 @@
 	}
 	Object.defineProperty(MaskInterface.prototype, 'maskPath', {
         get: function(){
-                if(this._mask.prop.k){
-                    this._mask.prop.getValue();
-                }
-                return this._mask.prop;
+            if(this._mask.prop.k){
+                this._mask.prop.getValue();
             }
-        });
+            return this._mask.prop;
+        }
+    });
+	Object.defineProperty(MaskInterface.prototype, 'maskOpacity', {
+        get: function(){
+            if(this._mask.op.k){
+                this._mask.op.getValue();
+            }
+            return this._mask.op.v * 100;
+        }
+    });
 
 	var MaskManager = function(maskManager, elem){
 		var _maskManager = maskManager;