Browse Source

Fix regressions in style manager

pull/79/merge
Artur Arseniev 9 years ago
parent
commit
5fad26396a
  1. 3
      src/style_manager/view/PropertyStackView.js
  2. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_animated.scssc
  3. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_bordered-pulled.scssc
  4. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_core.scssc
  5. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_fixed-width.scssc
  6. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_icons.scssc
  7. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_larger.scssc
  8. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_list.scssc
  9. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_mixins.scssc
  10. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_path.scssc
  11. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_rotated-flipped.scssc
  12. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_stacked.scssc
  13. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_variables.scssc
  14. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/font-awesome.scssc
  15. BIN
      styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/main.scssc
  16. 1
      test/specs/style_manager/model/Models.js
  17. 2
      test/specs/style_manager/view/PropertyStackView.js

3
src/style_manager/view/PropertyStackView.js

@ -110,7 +110,8 @@ define(['backbone','./PropertyCompositeView', 'text!./../templates/propertyStack
// If detached the value in this case is stacked, eg. substack-prop: 1px, 2px, 3px...
if (this.model.get('detached')) {
var valist = propView.getTargetValue().split(',');
var targetValue = propView.getTargetValue();
var valist = (targetValue + '').split(',');
result = valist[layerIndex];
result = result ? result.trim() : propView.getDefaultValue();
result = propView.tryFetchFromFunction(result);

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_animated.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_bordered-pulled.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_core.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_fixed-width.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_icons.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_larger.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_list.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_mixins.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_path.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_rotated-flipped.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_stacked.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/_variables.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/font-awesome.scssc

Binary file not shown.

BIN
styles/.sass-cache/83d63b0d9ef45ab4184e04a6df37fa72a944de96/main.scssc

Binary file not shown.

1
test/specs/style_manager/model/Models.js

@ -668,6 +668,7 @@ define([path + 'Sector',
properties : [{
property: 'background-image',
type: 'file',
functionName: 'url',
defaults: 'none',
},{
property: 'background-repeat',

2
test/specs/style_manager/view/PropertyStackView.js

@ -345,4 +345,4 @@ define([path + 'PropertyStackView', 'StyleManager/model/Property', 'DomComponent
}
};
});
});

Loading…
Cancel
Save