Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

changed importable to true for draggable and pinchable (sven + edwin) #441

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

changed importable to true for draggable and pinchable (sven + edwin) #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions extras/Studio.framer/app.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# l = new Layer
# point: Align.center
# draggable: true

l = new Layer
y: 298
x: 96
pinchable: true
draggable: true

# l.point = Align.center
# l.pinchable = true

4 changes: 2 additions & 2 deletions extras/Studio.framer/framer/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"deviceOrientation" : 0,
"sharedPrototype" : 1,
"contentScale" : 1,
"deviceType" : "apple-macbook",
"deviceType" : "custom",
"selectedHand" : "",
"updateDelay" : 0.3,
"deviceScale" : "fit",
"deviceScale" : 1,
"foldedCodeRanges" : [

],
Expand Down
1 change: 0 additions & 1 deletion framer/BaseClass.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ class exports.BaseClass extends EventEmitter

return unless descriptor.set

value = optionValue if descriptor.importable
value = Utils.valueOrDefault(optionValue, @_getPropertyDefaultValue(key))

return if value in [null, undefined]
Expand Down
4 changes: 2 additions & 2 deletions framer/Layer.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,13 +1016,13 @@ class exports.Layer extends BaseClass
## Draggable, Pinchable

@define "draggable",
importable: false
importable: true
exportable: false
get: -> @_draggable ?= new LayerDraggable(@)
set: (value) -> @draggable.enabled = value if _.isBoolean(value)

@define "pinchable",
importable: false
importable: true
exportable: false
get: -> @_pinchable ?= new LayerPinchable(@)
set: (value) -> @pinchable.enabled = value if _.isBoolean(value)
Expand Down