Permalink
Browse files

Merge branch 'feature/dpr'

  • Loading branch information...
nvh committed May 31, 2017
2 parents 2c2404c + 11480b4 commit 0ee68bdadfe68e254d42e6936be1024468561959
View
@@ -62,3 +62,5 @@ Icon
/extras/resources.framerjs.com/static/DeviceResources/.*
/yarn.lock
/extras/Studio.framer/framer/.bookmark
/extras/Studio.framer/framer/design.vekter
yarn-error.log
@@ -56,31 +56,8 @@ function showFileLoadingAlert() {
showAlert(html)
}
function showHomeScreenAlert() {
link = document.createElement("link");
link.href = "framer/mirror.css"
link.type = "text/css"
link.rel = "stylesheet"
link.media = "screen"
document.addEventListener("DOMContentLoaded", function(event) {
document.getElementsByTagName("head")[0].appendChild(link)
})
var html = ""
html += "<figure class='icon-close' href='javascript:void(0)' onclick='dismissAlert();'></figure>"
html += "<section class='wrapper'>"
html += "<figure class='icon-framer'></figure><h1>Install Prototype</h1>"
html += "<p>Tap <div class='share'><figure class='icon-share'></figure> Share</div>, then choose 'Add to Home Screen'</p> "
html += "<section class='arrow'><figure class='icon-arrow'></figure></section>"
html += "</section>"
showAlert(html)
}
function loadProject() {
CoffeeScript.load("app.coffee")
function loadProject(callback) {
CoffeeScript.load("app.coffee", callback)
}
function setDefaultPageTitle() {
@@ -113,12 +90,17 @@ function init() {
return showFileLoadingAlert()
}
// if (Utils.isMobile() && !isHomeScreened()) {
// return showHomeScreenAlert()
// }
loadProject()
loadProject(function(){
// CoffeeScript: Framer?.CurrentContext?.emit?("loaded:project")
var context;
if (typeof Framer !== "undefined" && Framer !== null) {
if ((context = Framer.CurrentContext) != null) {
if (typeof context.emit === "function") {
context.emit("loaded:project");
}
}
}
})
}
init()
@@ -1 +1 @@
6
7
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
@@ -31,6 +31,7 @@
<script src="framer/framer.debug.js"></script>
<script src="framer/framer.generated.js"></script>
<script src="framer/framer.modules.js"></script>
<script src="framer/framer.vekter.js"></script>
<script src="framer/framer.init.js"></script>
</head>
View
@@ -27,6 +27,8 @@ class Canvas extends BaseClass
onResize: (cb) -> @on("resize", cb)
_handleResize: (event) =>
if not Screen.device?
Screen.emit("resize")
@emit("resize")
@emit("change:width")
@emit("change:height")
View
@@ -269,7 +269,7 @@ class exports.Color extends BaseClass
@toColor: (color) -> return new Color(color)
@validColorValue: (color) -> return color instanceof Color or color is null
@isColor: (color) ->
@isColor: (color) =>
if _.isString(color)
return @isColorString(color)
else
Oops, something went wrong.

0 comments on commit 0ee68bd

Please sign in to comment.