diff options
| author | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
| commit | 71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (patch) | |
| tree | a432a4652bf7c96aea72a22bf27946eeee8fc4a5 /js/tools/EyedropperTool.js | |
| parent | 76db3eb0aa4ffe9e75812db570c793e9f852f853 (diff) | |
| parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
| download | ninja-71bc93ad0d53a77d70c688b2b3aacf694dd1de91.tar.gz | |
Merge branch 'master' into brushtool
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"; |