aboutsummaryrefslogtreecommitdiff
path: root/js/tools/EyedropperTool.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-11 11:17:41 -0700
committerArmen Kesablyan2012-06-11 11:17:41 -0700
commit278769df00ced8620fd73371e38fe2e43f07ca3b (patch)
treedeb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/tools/EyedropperTool.js
parent555fd6efa605b937800b3979a4c68fa7eb8666ae (diff)
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
downloadninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/tools/EyedropperTool.js')
-rwxr-xr-xjs/tools/EyedropperTool.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 6678e498..6a56004d 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -376,7 +376,6 @@ exports.EyedropperTool = Montage.create(toolBase, {
376 if(worldData) 376 if(worldData)
377 { 377 {
378 this._webGlDataCanvas = njModule.NJUtils.make("canvas", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, this.application.ninja.currentDocument); 378 this._webGlDataCanvas = njModule.NJUtils.make("canvas", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, this.application.ninja.currentDocument);
379 njModule.NJUtils.createModelWithShape(this._webGlDataCanvas, "Canvas");
380 this._applyElementStyles(elt, this._webGlDataCanvas, ["display", "position", "width", "height", 379 this._applyElementStyles(elt, this._webGlDataCanvas, ["display", "position", "width", "height",
381 "-webkit-transform", "-webkit-transform-style"]); 380 "-webkit-transform", "-webkit-transform-style"]);
382 this._webGlDataCanvas.style.left = eltCoords[0] + "px"; 381 this._webGlDataCanvas.style.left = eltCoords[0] + "px";