Skip to content

Commit

Permalink
layer clipping desabled by default
Browse files Browse the repository at this point in the history
  • Loading branch information
J.P.P Treub committed Feb 3, 2016
1 parent b1ec9bc commit c182568
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion framer/Layer.coffee
Expand Up @@ -121,7 +121,7 @@ class exports.Layer extends BaseClass
@define "visible", layerProperty(@, "visible", "display", true, _.isBoolean) @define "visible", layerProperty(@, "visible", "display", true, _.isBoolean)
@define "opacity", layerProperty(@, "opacity", "opacity", 1, _.isNumber) @define "opacity", layerProperty(@, "opacity", "opacity", 1, _.isNumber)
@define "index", layerProperty(@, "index", "zIndex", 0, _.isNumber, null, {importable:false, exportable:false}) @define "index", layerProperty(@, "index", "zIndex", 0, _.isNumber, null, {importable:false, exportable:false})
@define "clip", layerProperty(@, "clip", "overflow", true, _.isBoolean) @define "clip", layerProperty(@, "clip", "overflow", false, _.isBoolean)


@define "scrollHorizontal", layerProperty @, "scrollHorizontal", "overflowX", false, _.isBoolean, null, {}, (layer, value) -> @define "scrollHorizontal", layerProperty @, "scrollHorizontal", "overflowX", false, _.isBoolean, null, {}, (layer, value) ->
layer.ignoreEvents = false if value is true layer.ignoreEvents = false if value is true
Expand Down
15 changes: 7 additions & 8 deletions test/tests/LayerTest.coffee
Expand Up @@ -227,19 +227,18 @@ describe "Layer", ->


layer = new Layer layer = new Layer


layer.clip.should.equal true layer.clip.should.equal false
layer.style["overflow"].should.equal "hidden"

layer.clip = false
layer.scroll.should.equal false
layer.style["overflow"].should.equal "visible" layer.style["overflow"].should.equal "visible"


layer.clip = true
layer.style["overflow"].should.equal "hidden"

it "should set scroll", -> it "should set scroll", ->


layer = new Layer layer = new Layer


layer.scroll.should.equal false layer.scroll.should.equal false
layer.style["overflow"].should.equal "hidden" layer.style["overflow"].should.equal "visible"


layer.scroll = true layer.scroll = true
layer.scroll.should.equal true layer.scroll.should.equal true
Expand All @@ -249,7 +248,7 @@ describe "Layer", ->


layer.scroll = false layer.scroll = false
layer.scroll.should.equal false layer.scroll.should.equal false
layer.style["overflow"].should.equal "hidden" layer.style["overflow"].should.equal "visible"


it "should set scroll from properties", -> it "should set scroll from properties", ->


Expand All @@ -264,7 +263,7 @@ describe "Layer", ->
layer = new Layer layer = new Layer


layer.scroll.should.equal false layer.scroll.should.equal false
layer.style["overflow"].should.equal "hidden" layer.style["overflow"].should.equal "visible"
layer.ignoreEvents.should.equal true layer.ignoreEvents.should.equal true


layer.scroll = true layer.scroll = true
Expand Down

0 comments on commit c182568

Please sign in to comment.