Skip to content
Permalink
Browse files

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

  • Loading branch information...
koenbok committed Jun 16, 2014
2 parents fafb016 + e2ab4ff commit 1fb5c9e19e711e4d58aa702b5f18f02b30778cdb
Showing with 7 additions and 7 deletions.
  1. +1 −1 docs/Plan.md
  2. +1 −1 extras/CactusFramer/static/should.js
  3. +1 −1 framer/Importer.coffee
  4. +1 −1 framer/Layer.coffee
  5. +2 −2 readme.md
  6. +1 −1 test/vendor/chai.js
@@ -5,7 +5,7 @@
- Add a way to copy and deepcopy layer hierarchies.
- Add a way to set text or html content without removing the other layers by accident.
- Maybe ditcht the PSD global for layers and use something more
- Add a way to get a sublayer by it's (PSD) name. layer.subLayerWithName(LayerName)
- Add a way to get a sublayer by its (PSD) name. layer.subLayerWithName(LayerName)


# Events
@@ -1986,7 +1986,7 @@ function formatValue(ctx, value, recurseTimes) {
if (ctx.customInspect &&
value &&
isFunction(value.inspect) &&
// Filter out the util module, it's inspect function is special
// Filter out the util module, its inspect function is special
value.inspect !== exports.inspect &&
// Also filter out any prototype objects using the circular check.
!(value.constructor && value.constructor.prototype === value)) {
@@ -81,7 +81,7 @@ class exports.Importer
layerInfo.frame = info.image.frame
layerInfo.image = Utils.pathJoin @path, info.image.path

# If there is a mask on this layer group, take it's frame
# If there is a mask on this layer group, take its frame
if info.maskFrame
layerInfo.frame = info.maskFrame
layerInfo.clip = true
@@ -421,7 +421,7 @@ class exports.Layer extends BaseClass
# Set the superlayer
@_superLayer = layer

# Place this layer on top of it's siblings
# Place this layer on top of its siblings
@bringToFront()

@emit "change:superLayer"
@@ -41,7 +41,7 @@ Framer 3 is close to a rewrite. Or maybe more a huge refactor. The new code base
- Added damping harmonic oscillator spring physics (curve: "spring-dho")
- Very simple infrastructure to add your own animators:
- Emit a number on a tick
- Check if the animation has reached it's end
- Check if the animation has reached its end
- Support for future advanced animators like real physics and path animators

#### Big Changes
@@ -86,7 +86,7 @@ Framer 3 is close to a rewrite. Or maybe more a huge refactor. The new code base
#### Plans

- Add back in the css keyframe animation backend and allow to switch between them on a per animation basis.
- Add more animatable properties. You can set layer.style as an animation target and animate it's numeric css properties. - We'll have to put some converters in to tween between colors, gradients, shadows, etc.
- Add more animatable properties. You can set layer.style as an animation target and animate its numeric css properties. - We'll have to put some converters in to tween between colors, gradients, shadows, etc.
- Add back in the box2d physics engine and come up with a testable api
- Research FF/IE support

@@ -3442,7 +3442,7 @@
// Provide a hook for user-specified inspect functions.
// Check that value is an object with an inspect function on it
if (value && typeof value.inspect === 'function' &&
// Filter out the util module, it's inspect function is special
// Filter out the util module, its inspect function is special
value.inspect !== exports.inspect &&
// Also filter out any prototype objects using the circular check.
!(value.constructor && value.constructor.prototype === value)) {

0 comments on commit 1fb5c9e

Please sign in to comment.
You can’t perform that action at this time.