Permalink
Browse files

Merge branch 'master' of github.com:koenbok/Framer

  • Loading branch information...
koenbok committed May 12, 2015
2 parents 6707a25 + c7c152f commit 9ee696dd7cb7fbdd90429e9c1d00952557df48ba
Showing with 8 additions and 6 deletions.
  1. +5 −3 framer/Components/SliderComponent.coffee
  2. +2 −2 framer/Layer.coffee
  3. +1 −1 readme.md
@@ -33,20 +33,21 @@ class exports.SliderComponent extends Layer
@fill = new Layer
backgroundColor: "#333"
width: 0, borderRadius: 50
force2d: true
width: 0, force2d: true
super options
@knobSize = options.knobSize or 30
@knob.superLayer = @fill.superLayer = @
@fill.height = @height
@fill.borderRadius = @borderRadius
@knob.draggable.enabled = true
@knob.draggable.speedY = 0
@knob.draggable.overdrag = false
@knob.draggable.momentum = true
@knob.draggable.momentumOptions = {friction: 2, tolerance: 1/10}
@knob.draggable.momentumOptions = {friction: 5, tolerance: 0.25}
@knob.draggable.bounce = false
@knob.draggable.propagateEvents = false
@knob.borderRadius = "50%"
@@ -87,6 +88,7 @@ class exports.SliderComponent extends Layer
# y: -@knob.height / 2
# height: @height + @knob.height
@fill.height = @height
@knob.centerY()
_setRadius: =>
View
@@ -138,7 +138,7 @@ class exports.Layer extends BaseClass
@define "rotationY", layerProperty(@, "rotationY", "webkitTransform", 0, _.isNumber)
@define "rotationZ", layerProperty(@, "rotationZ", "webkitTransform", 0, _.isNumber)
@define "rotation",
exportable: false
#exportable: false
get: -> @rotationZ
set: (value) -> @rotationZ = value
@@ -205,7 +205,7 @@ class exports.Layer extends BaseClass
# And, because it should be cornerRadius, we alias it here
@define "cornerRadius",
importable: yes
exportable: no
# exportable: no
get: -> @borderRadius
set: (value) -> @borderRadius = value
View
@@ -54,7 +54,7 @@ imageLayer.on(Events.Click, function() {
## Framer Generator
With a Sketch or Photoshop file open, open Framer Generator and click **Import**. Only layer groups are imported; single layers are ignored. The hierarchy of your layer groups is respected.
You can safely move things around in Sketch or Photoshop and re-import. Generator will update the images and any changes in hierarchy, but leave your code intact. [See our documentation](http://framerjs.com/learn/importing/) for more.
You can safely move things around in Sketch or Photoshop and re-import. Generator will update the images and any changes in hierarchy, but leave your code intact. [See our documentation](http://framerjs.com/learn/import/) for more.
- Access any layer by its group name
- Groups within groups will become subLayers

0 comments on commit 9ee696d

Please sign in to comment.