Merge pull request #2384 from ScottDowne/rebase-fix

Pomax · Pomax · commit 854e54106c7f · 2015-01-07T12:25:19.000-08:00
resync to master
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "appmaker",
-  "version": "0.0.15",
+  "version": "0.0.20",
   "description": "Appmaker",
   "repository": {
     "type": "git",
diff --git a/public/bundles/components/component-chef-adventure/component.css b/public/bundles/components/component-chef-adventure/component.css
@@ -19,6 +19,10 @@
   background-color: white;
 }
 
+:host .player {
+  background-size: 100% 100%;
+}
+
 :host .tile-palette {
   width: 100%;
 }
diff --git a/public/bundles/components/component-chef-adventure/component.html b/public/bundles/components/component-chef-adventure/component.html
@@ -232,6 +232,10 @@
           "description": "",
           "label": ""
         },
+        "setavatar": {
+          "description": "",
+          "label": ""
+        },
         "removeplayer": {
           "description": "",
           "label": ""
@@ -507,6 +511,9 @@
           this.objectPalette = sender.getAttribute("data-palette");
           this.wallPalette = sender.getAttribute("data-palette");
         },
+        setavatar: function(avatar) {
+          this.playersprite = avatar;
+        },
         removeplayer: function() {
           var player = this.querySelector(".player");
           if (player) {
diff --git a/public/designer/js/editable.js b/public/designer/js/editable.js
@@ -310,7 +310,7 @@ var editableTypeHandlers = {
       var image = document.createElement("img");
       image.onload = function() {
         dataInput.classList.remove("error");
-        previewCtx.drawImage(image,0,0);
+        previewCtx.drawImage(image,0,0,image.width,image.height,0,0,width,height);
         callback && callback();
       };
       image.onerror = function() {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "appmaker",`
`3`		`- "version": "0.0.15",`
	`3`	`+ "version": "0.0.20",`
`4`	`4`	`"description": "Appmaker",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@`
`19`	`19`	`background-color: white;`
`20`	`20`	`}`
`21`	`21`
	`22`	`+:host .player {`
	`23`	`+ background-size: 100% 100%;`
	`24`	`+}`
	`25`	`+`
`22`	`26`	`:host .tile-palette {`
`23`	`27`	`width: 100%;`
`24`	`28`	`}`