diff options
author | Jose Antonio Marquez | 2012-06-07 11:28:25 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-07 11:28:25 -0700 |
commit | 7d1a564a8fd246c621f674b5521554fbfc058281 (patch) | |
tree | d1be340a099e318db8113b651ba45c3d4c00f3a5 /js/tools/EyedropperTool.js | |
parent | 0efbbf8287517b755be1774f6aa49947bed50a0d (diff) | |
parent | b75fe9369f7caec0351d298f7106c8d59572b440 (diff) | |
download | ninja-7d1a564a8fd246c621f674b5521554fbfc058281.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/tools/EyedropperTool.js')
-rwxr-xr-x | js/tools/EyedropperTool.js | 1 |
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"; |