diff --git a/index.html b/index.html index 800fd5996..1eda77747 100755 --- a/index.html +++ b/index.html @@ -1037,7 +1037,14 @@ sectors: [{ name: 'General', open: false, - buildProps: ['float', 'display', 'position', 'top', 'right', 'left', 'bottom'], + buildProps: ['opacity', 'float', 'display', 'position', 'top', 'right', 'left', 'bottom'], + properties: [{ + type: 'slider', + property: 'opacity', + step: 0.01, + max: 1, + min:0, + }] },{ name: 'Dimension', open: false, @@ -1274,11 +1281,6 @@ }]); var bm = editor.BlockManager; - bm.add('mappy', { - label: 'Map', - attributes: {class:'fa fa-marker'}, - content: {type: 'map'} - }) /* bm.add('link-block', { label: 'Link Block', diff --git a/src/style_manager/model/Properties.js b/src/style_manager/model/Properties.js index f4d30869a..c7288ca62 100644 --- a/src/style_manager/model/Properties.js +++ b/src/style_manager/model/Properties.js @@ -57,6 +57,15 @@ module.exports = require('backbone').Collection.extend(TypeableCollection).exten return value; } } + },{ + id: 'slider', + model: require('./PropertySlider'), + view: require('./../view/PropertySliderView'), + isType(value) { + if (value && value.type == 'slider') { + return value; + } + } },{ id: 'integer', model: require('./PropertyInteger'), diff --git a/src/style_manager/model/PropertySlider.js b/src/style_manager/model/PropertySlider.js new file mode 100644 index 000000000..c21975e71 --- /dev/null +++ b/src/style_manager/model/PropertySlider.js @@ -0,0 +1,9 @@ +const Property = require('./PropertyInteger'); + +module.exports = Property.extend({ + + defaults: Object.assign({}, Property.prototype.defaults, { + showInput: 1, + }), + +}); diff --git a/src/style_manager/view/PropertyIntegerView.js b/src/style_manager/view/PropertyIntegerView.js index d8b4a41b0..cee5624ad 100644 --- a/src/style_manager/view/PropertyIntegerView.js +++ b/src/style_manager/view/PropertyIntegerView.js @@ -1,4 +1,4 @@ -var InputNumber = require('domain_abstract/ui/InputNumber'); +const InputNumber = require('domain_abstract/ui/InputNumber'); module.exports = require('./PropertyView').extend({ diff --git a/src/style_manager/view/PropertySliderView.js b/src/style_manager/view/PropertySliderView.js new file mode 100644 index 000000000..abaf2d323 --- /dev/null +++ b/src/style_manager/view/PropertySliderView.js @@ -0,0 +1,79 @@ +const InputNumber = require('domain_abstract/ui/InputNumber'); + +module.exports = require('./PropertyView').extend({ + + events: { + 'change': 'inputValueChanged', + 'input': 'inputValueChangedSoft', + }, + + template(model) { + const pfx = this.pfx; + const ppfx = this.ppfx; + return ` +