Skip to content
Permalink
Browse files

Merge branch 'context'

  • Loading branch information...
koenbok committed Sep 22, 2014
2 parents 4a29f4e + 4fecafa commit 065fa1860cbe27601c237b6fecca48b91e610166
Showing with 2,164 additions and 381 deletions.
  1. +4 −1 .gitignore
  2. +15 −6 Makefile
  3. +727 −13 extras/CactusFramer/static/app.coffee
  4. BIN extras/DeviceResources/apple-watch-edition.jp2
  5. BIN extras/DeviceResources/apple-watch-edition.png
  6. BIN extras/DeviceResources/apple-watch-sport.jp2
  7. BIN extras/DeviceResources/apple-watch-sport.png
  8. BIN extras/DeviceResources/apple-watch.jp2
  9. BIN extras/DeviceResources/apple-watch.png
  10. BIN extras/DeviceResources/ipad-air-silver-hand.jp2
  11. BIN extras/DeviceResources/ipad-air-silver-hand.png
  12. BIN extras/DeviceResources/ipad-air-silver.jp2
  13. BIN extras/DeviceResources/ipad-air-silver.png
  14. BIN extras/DeviceResources/ipad-air-spacegray-hand.jp2
  15. BIN extras/DeviceResources/ipad-air-spacegray-hand.png
  16. BIN extras/DeviceResources/ipad-air-spacegray.jp2
  17. BIN extras/DeviceResources/ipad-air-spacegray.png
  18. BIN extras/DeviceResources/ipad-mini-silver-hand.jp2
  19. BIN extras/DeviceResources/ipad-mini-silver-hand.png
  20. BIN extras/DeviceResources/ipad-mini-silver.jp2
  21. BIN extras/DeviceResources/ipad-mini-silver.png
  22. BIN extras/DeviceResources/ipad-mini-spacegray-hand.jp2
  23. BIN extras/DeviceResources/ipad-mini-spacegray-hand.png
  24. BIN extras/DeviceResources/ipad-mini-spacegray.jp2
  25. BIN extras/DeviceResources/ipad-mini-spacegray.png
  26. BIN extras/DeviceResources/iphone-5c-blue-hand.jp2
  27. BIN extras/DeviceResources/iphone-5c-blue-hand.png
  28. BIN extras/DeviceResources/iphone-5c-blue.jp2
  29. BIN extras/DeviceResources/iphone-5c-blue.png
  30. BIN extras/DeviceResources/iphone-5c-green-hand.jp2
  31. BIN extras/DeviceResources/iphone-5c-green-hand.png
  32. BIN extras/DeviceResources/iphone-5c-green.jp2
  33. BIN extras/DeviceResources/iphone-5c-green.png
  34. BIN extras/DeviceResources/iphone-5c-pink-hand.jp2
  35. BIN extras/DeviceResources/iphone-5c-pink-hand.png
  36. BIN extras/DeviceResources/iphone-5c-pink.jp2
  37. BIN extras/DeviceResources/iphone-5c-pink.png
  38. BIN extras/DeviceResources/iphone-5c-white-hand.jp2
  39. BIN extras/DeviceResources/iphone-5c-white-hand.png
  40. BIN extras/DeviceResources/iphone-5c-white.jp2
  41. BIN extras/DeviceResources/iphone-5c-white.png
  42. BIN extras/DeviceResources/iphone-5c-yellow-hand.jp2
  43. BIN extras/DeviceResources/iphone-5c-yellow-hand.png
  44. BIN extras/DeviceResources/iphone-5c-yellow.jp2
  45. BIN extras/DeviceResources/iphone-5c-yellow.png
  46. BIN extras/DeviceResources/iphone-5s-gold-hand.jp2
  47. BIN extras/DeviceResources/iphone-5s-gold-hand.png
  48. BIN extras/DeviceResources/iphone-5s-gold.jp2
  49. BIN extras/DeviceResources/iphone-5s-gold.png
  50. BIN extras/DeviceResources/iphone-5s-silver-hand.jp2
  51. BIN extras/DeviceResources/iphone-5s-silver-hand.png
  52. BIN extras/DeviceResources/iphone-5s-silver.jp2
  53. BIN extras/DeviceResources/iphone-5s-silver.png
  54. BIN extras/DeviceResources/iphone-5s-spacegray-hand.jp2
  55. BIN extras/DeviceResources/iphone-5s-spacegray-hand.png
  56. BIN extras/DeviceResources/iphone-5s-spacegray.jp2
  57. BIN extras/DeviceResources/iphone-5s-spacegray.png
  58. BIN extras/DeviceResources/iphone-6-gold-hand.jp2
  59. BIN extras/DeviceResources/iphone-6-gold-hand.png
  60. BIN extras/DeviceResources/iphone-6-gold.jp2
  61. BIN extras/DeviceResources/iphone-6-gold.png
  62. BIN extras/DeviceResources/iphone-6-silver-hand.jp2
  63. BIN extras/DeviceResources/iphone-6-silver-hand.png
  64. BIN extras/DeviceResources/iphone-6-silver.jp2
  65. BIN extras/DeviceResources/iphone-6-silver.png
  66. BIN extras/DeviceResources/iphone-6-spacegray-hand.jp2
  67. BIN extras/DeviceResources/iphone-6-spacegray-hand.png
  68. BIN extras/DeviceResources/iphone-6-spacegray.jp2
  69. BIN extras/DeviceResources/iphone-6-spacegray.png
  70. BIN extras/DeviceResources/nexus-5-black-hand.jp2
  71. BIN extras/DeviceResources/nexus-5-black-hand.png
  72. BIN extras/DeviceResources/nexus-5-black.jp2
  73. BIN extras/DeviceResources/nexus-5-black.png
  74. +6 −0 extras/resources.framerjs.com/config.json
  75. +23 −0 extras/resources.framerjs.com/pages/error.html
  76. +4 −0 extras/resources.framerjs.com/pages/index.html
  77. +6 −0 extras/resources.framerjs.com/pages/robots.txt
  78. +8 −0 extras/resources.framerjs.com/pages/sitemap.xml
  79. 0 extras/resources.framerjs.com/plugins/__init__.py
  80. +29 −0 extras/resources.framerjs.com/plugins/default.py
  81. +1 −0 extras/resources.framerjs.com/static/DeviceResources
  82. +22 −0 extras/resources.framerjs.com/templates/base.html
  83. +1 −1 framer/Animation.coffee
  84. +46 −18 framer/AnimationLoop.coffee
  85. +8 −4 framer/BackgroundLayer.coffee
  86. +5 −3 framer/BaseClass.coffee
  87. +3 −1 framer/Config.coffee
  88. +71 −0 framer/Context.coffee
  89. +27 −7 framer/Debug.coffee
  90. +22 −0 framer/Defaults.coffee
  91. +727 −0 framer/DeviceView.coffee
  92. +2 −64 framer/EventEmitter.coffee
  93. +60 −0 framer/EventManager.coffee
  94. +4 −0 framer/Events.coffee
  95. +1 −0 framer/Extras/MobileScrollFix.coffee
  96. +7 −3 framer/Framer.coffee
  97. +109 −89 framer/Layer.coffee
  98. +17 −14 framer/LayerDraggable.coffee
  99. +1 −0 framer/LayerStates.coffee
  100. +54 −54 framer/LayerStyle.coffee
  101. +43 −34 framer/Print.coffee
  102. +8 −10 framer/Screen.coffee
  103. +0 −1 framer/Session.coffee
  104. +64 −44 framer/Utils.coffee
  105. +10 −9 package.json
  106. +8 −0 scripts/fix-sourcemap.coffee
  107. +15 −0 scripts/optimize.py
  108. +1 −1 test/init.coffee
  109. +2 −1 test/tests/LayerAnimationTest.coffee
  110. +3 −3 test/tests/LayerTest.coffee
@@ -5,4 +5,7 @@ test/lib/framer.js
*.swp
build/template
build
lib
lib
.build
.deploy
*.pyc
@@ -13,13 +13,16 @@ build:
# $(coffee) scripts/banner.coffee > build/framer.debug.js
$(browserify) framer/Framer.coffee >> build/framer.debug.js
cat build/framer.debug.js | $(bin)/exorcist build/framer.js.map > build/framer.js
$(bin)/uglifyjs \
--in-source-map build/framer.js.map \
--source-map build/framer.min.js.map build/framer.js \
> build/framer.min.js
# Build the minimized version
# cd build; ../$(bin)/uglifyjs \
# --source-map-include-sources \
# --in-source-map framer.js.map \
# --source-map framer.min.js.map \
# framer.js > framer.min.js
# $(coffee) scripts/fix-sourcemap.coffee
# Copy the file over to the cactus project
cp build/framer.js extras/CactusFramer/static/framer.js
cp build/framer.js.map extras/CactusFramer/static/framer.js.map
cp build/framer.js extras/CactusFramer/static/
cp build/framer.js.map extras/CactusFramer/static/
buildw:
$(watch) make build

@@ -80,6 +83,12 @@ deploy:
make site:build
make site:upload

resources%optimize:
python scripts/optimize.py

resources%upload:
cd extras/resources.framerjs.com; cactus deploy

publish:
# Todo: update version
coffee -o lib/ -c framer/
Oops, something went wrong.

0 comments on commit 065fa18

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