Browse Source

Update radio and color input styles

pull/437/head
Artur Arseniev 8 years ago
parent
commit
6a79df527b
  1. 2
      dist/css/grapes.min.css
  2. 2
      src/style_manager/view/PropertyRadioView.js
  3. 11
      src/styles/scss/_gjs_inputs.scss
  4. 19
      src/utils/Sorter.js

2
dist/css/grapes.min.css

File diff suppressed because one or more lines are too long

2
src/style_manager/view/PropertyRadioView.js

@ -36,7 +36,7 @@ module.exports = require('./PropertyView').extend({
});
const inputHld = this.el.querySelector(`#${pfx}input-holder`);
inputHld.innerHTML = `<div>${inputStr}</div>`;
inputHld.innerHTML = `<div class="${ppfx}radio-items">${inputStr}</div>`;
this.input = inputHld.firstChild;
}
}

11
src/styles/scss/_gjs_inputs.scss

@ -137,6 +137,10 @@
right: $inputPadding - 2px;
top: 0;
}
&-color {
width: 100%;
}
}
.#{$app-prefix}field-color {
@ -207,7 +211,8 @@
}
.#{$app-prefix}radio-item {
float: left;
flex: 1 1 auto;
text-align: center;
border-left: 1px solid $darkTextShadow;
&:first-child {
@ -225,6 +230,10 @@
input:checked + .#{$app-prefix}radio-item-label {
background-color: rgba(255, 255, 255, 0.2);
}
&s {
display: flex;
}
}
.#{$app-prefix}radio-item-label {

19
src/utils/Sorter.js

@ -266,9 +266,9 @@ module.exports = Backbone.View.extend({
srcModel && srcModel.set && srcModel.set('status', 'freezed');
}
on(container, 'mousemove', this.onMove)
on(docs, 'mouseup', this.endMove)
on(document, 'keydown', this.rollback)
on(container, 'mousemove', this.onMove);
on(docs, 'mouseup', this.endMove);
on(docs, 'keydown', this.rollback);
onStart && onStart();
// Avoid strange effects on dragging
@ -770,10 +770,11 @@ module.exports = Backbone.View.extend({
endMove(e) {
console.log('endmove');
var created;
const docs = this.getDocuments();
const container = this.getContainerEl();
off(container, 'mousemove', this.onMove);
off(document, 'mouseup', this.endMove);
off(document, 'keydown', this.rollback);
off(docs, 'mouseup', this.endMove);
off(docs, 'keydown', this.rollback);
//this.$document.off('mouseup', this.endMove);
//this.$document.off('keydown', this.rollback);
this.plh.style.display = 'none';
@ -885,15 +886,13 @@ module.exports = Backbone.View.extend({
* @param {Bool} Indicates if rollback in anycase
* */
rollback(e) {
$(document).off('keydown', this.rollback);
this.$document.off('keydown', this.rollback);
var key = e.which || e.keyCode;
off(this.getDocuments(), 'keydown', this.rollback);
const key = e.which || e.keyCode;
if (key == 27) {
this.moved = false;
this.moved = 0;
this.endMove();
}
return;
},
});

Loading…
Cancel
Save