summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-03-31 17:13:43 -0400
committerJacob Schatz <jschatz1@gmail.com>2017-03-31 17:13:43 -0400
commit69f4a9495af1aa1b53b4028aaf5247c235fe100b (patch)
tree2f1c264ee1d0f99b0edf7c18aa97bdfb13cae6a6
parent8498c7fd407c6055a35d3b414a954f75fe38b627 (diff)
downloadgitlab-ce-sketch43viewer.tar.gz
Add different propssketch43viewer
-rw-r--r--app/assets/javascripts/blob/sketch/index.js2
-rw-r--r--app/assets/javascripts/blob/sketch/sketch_render.js24
2 files changed, 24 insertions, 2 deletions
diff --git a/app/assets/javascripts/blob/sketch/index.js b/app/assets/javascripts/blob/sketch/index.js
index 39f5cd435ef..314637aa2d0 100644
--- a/app/assets/javascripts/blob/sketch/index.js
+++ b/app/assets/javascripts/blob/sketch/index.js
@@ -93,7 +93,7 @@ export default class SketchLoader {
<input type="text" v-model="currentPos.height" class="form-control" readonly="readonly"/>
</label>
</fieldset>
- <fieldset v-if="backgroundColor">
+ <fieldset v-if="hasBackgroundColor">
<legend>BG Color</legend>
<label>
<span>Hex</span>
diff --git a/app/assets/javascripts/blob/sketch/sketch_render.js b/app/assets/javascripts/blob/sketch/sketch_render.js
index ed224824d9f..08cb8c3a07a 100644
--- a/app/assets/javascripts/blob/sketch/sketch_render.js
+++ b/app/assets/javascripts/blob/sketch/sketch_render.js
@@ -13,6 +13,11 @@ export default class SketchRender {
rgba: 'rgba(0,0,0,1)'
},
hasBackgroundColor: false,
+ hasFill: false,
+ style: {
+ blendingMode: 0,
+ opacity: 1
+ }
currentPos: {
x: 0,
y: 0,
@@ -111,6 +116,22 @@ export default class SketchRender {
}
},
+ setFill(bgColor) {
+
+ },
+
+ setBlendingMode(layer) {
+ if(layer.hasOwnProperty('style')){
+
+ }
+ },
+
+ setOpacity(layer) {
+ if(layer.hasOwnProperty('style')){
+
+ }
+ },
+
layerSelected(layer) {
this.currentPos.x = layer.frame.x;
this.currentPos.y = layer.frame.y;
@@ -119,7 +140,8 @@ export default class SketchRender {
this.activeLayer = layer.do_objectID;
this.hasBackgroundColor = layer.hasBackgroundColor;
this.setBackgroundColor(layer.backgroundColor);
- console.log('layer._class',layer._class);
+ setBlendingMode(layer);
+ setOpacity(layer);
console.log('layer',layer);
}
}