Browse Source

Update number trait value with units

pull/79/merge
Artur Arseniev 10 years ago
parent
commit
367517ffe0
  1. 2
      bower.json
  2. 4
      dist/grapes.min.js
  3. 2
      package.json
  4. 7
      src/trait_manager/view/TraitNumberView.js
  5. 6
      src/trait_manager/view/TraitView.js

2
bower.json

@ -1,7 +1,7 @@
{ {
"name": "grapesjs", "name": "grapesjs",
"description": "Open source Web Template Editor", "description": "Open source Web Template Editor",
"version": "0.5.7", "version": "0.5.8",
"author": "Artur Arseniev", "author": "Artur Arseniev",
"homepage": "http://grapesjs.com", "homepage": "http://grapesjs.com",
"main": [ "main": [

4
dist/grapes.min.js

File diff suppressed because one or more lines are too long

2
package.json

@ -1,7 +1,7 @@
{ {
"name": "grapesjs", "name": "grapesjs",
"description": "Open source Web Template Editor", "description": "Open source Web Template Editor",
"version": "0.5.7", "version": "0.5.8",
"author": "Artur Arseniev", "author": "Artur Arseniev",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"homepage": "http://grapesjs.com", "homepage": "http://grapesjs.com",

7
src/trait_manager/view/TraitNumberView.js

@ -3,6 +3,13 @@ define(['./TraitView', 'Abstract/ui/InputNumber'],
return TraitView.extend({ return TraitView.extend({
getValueForTarget: function () {
var model = this.model;
var value = model.get('value');
var unit = model.get('unit');
return value ? (value + unit) : '';
},
/** /**
* Returns input element * Returns input element
* @return {HTMLElement} * @return {HTMLElement}

6
src/trait_manager/view/TraitView.js

@ -29,6 +29,10 @@ define(['backbone'], function (Backbone) {
this.model.set('value', this.getInputEl().value); this.model.set('value', this.getInputEl().value);
}, },
getValueForTarget: function () {
return this.model.get('value');
},
/** /**
* On change callback * On change callback
* @private * @private
@ -37,7 +41,7 @@ define(['backbone'], function (Backbone) {
var m = this.model; var m = this.model;
var trg = this.target; var trg = this.target;
var name = m.get('name'); var name = m.get('name');
var value = m.get('value'); var value = this.getValueForTarget();
// Chabge property if requested otherwise attributes // Chabge property if requested otherwise attributes
if(m.get('changeProp')){ if(m.get('changeProp')){
trg.set(name, value); trg.set(name, value);

Loading…
Cancel
Save