Send more info about a layer from the backend

firebug · Mar 8, 2015 · caca1a0 · caca1a0
1 parent b25c98b
commit caca1a0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/lib/pixel-perfect-actor.js b/lib/pixel-perfect-actor.js
@@ -284,13 +284,19 @@ var PixelPerfectActor = ActorClass(
     }
 
     // Get all properties of associate anonymous content
-    let anonId = "box" + layer.id;
+    let boxAnonId = "box" + layer.id;
+    let imageAnonId = layer.id;
     let content = layer.content;
 
     result.content = {
-      style: content.getAttributeForElement(anonId, "style"),
-      lock: content.getAttributeForElement(anonId, "lock"),
-      invert: content.getAttributeForElement(anonId, "invert"),
+      box: {
+        style: content.getAttributeForElement(boxAnonId, "style"),
+        lock: content.getAttributeForElement(boxAnonId, "lock"),
+        invert: content.getAttributeForElement(boxAnonId, "invert"),
+      },
+      image: {
+        style: content.getAttributeForElement(imageAnonId, "style"),
+      }
     }
 
     return result;
@@ -392,9 +398,9 @@ var PixelPerfectActor = ActorClass(
 
     // Update image box styles
     let boxStyle = "";
-    boxStyle += "left: " + parseInt(layer.x, 10) + "px;";
-    boxStyle += "top: " + parseInt(layer.y, 10) + "px;";
-    boxStyle += "display: " + (layer.visible ? "block" : "none") + ";";
+    boxStyle += "left:" + parseInt(layer.x, 10) + "px;";
+    boxStyle += "top:" + parseInt(layer.y, 10) + "px;";
+    boxStyle += "display:" + (layer.visible ? "block" : "none") + ";";
     content.setAttributeForElement("box" + layer.id, "style", boxStyle);
 
     if (layer.lock) {
@@ -411,8 +417,8 @@ var PixelPerfectActor = ActorClass(
 
     // Update image styles
     let imageStyle = "";
-    imageStyle += "opacity: " + (parseInt(layer.opacity, 10) / 100) + ";";
-    imageStyle += "transform: " + (layer.scale ? "scale(" + layer.scale + ")" : "none") + ";";
+    imageStyle += "opacity:" + (parseInt(layer.opacity, 10) / 100) + ";";
+    imageStyle += "transform:" + (layer.scale ? "scale(" + layer.scale + ")" : "none") + ";";
     content.setAttributeForElement(layer.id, "style", imageStyle);
   }),
 

diff --git a/test/test-layer-invert.js b/test/test-layer-invert.js
@@ -20,7 +20,7 @@ exports["test Layer Invert"] = function(assert, done) {
     waitForEvents(popup, ["layer-modified"]).then(result => {
       // Get layer info from the backend.
       popup.front.getLayerInfo(layer.id).then(response => {
-        assert.equal(response.content.invert, "true",
+        assert.equal(response.content.box.invert, "true",
           "The layer must be inverted");
 
         // Clean up
@@ -30,7 +30,7 @@ exports["test Layer Invert"] = function(assert, done) {
             done();
           });
         });
-      })
+      });
     });
   });
 };

diff --git a/test/test-layer-lock.js b/test/test-layer-lock.js
@@ -20,7 +20,7 @@ exports["test Layer Lock"] = function(assert, done) {
     waitForEvents(popup, ["layer-modified"]).then(() => {
       // Get layer info from the backend.
       popup.front.getLayerInfo(layer.id).then(response => {
-        assert.equal(response.content.lock, "true",
+        assert.equal(response.content.box.lock, "true",
           "The layer must be locked");
 
         // Clean up