diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/tools/ShapeTool.js | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/tools/ShapeTool.js')
| -rwxr-xr-x[-rw-r--r--] | js/tools/ShapeTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index 4ccb7a8d..29e9b99f 100644..100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
| @@ -66,7 +66,7 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
| 66 | var canvas; | 66 | var canvas; |
| 67 | if(!this._useExistingCanvas()) | 67 | if(!this._useExistingCanvas()) |
| 68 | { | 68 | { |
| 69 | canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", null, true); | 69 | canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); |
| 70 | var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height, | 70 | var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height, |
| 71 | drawData.planeMat, drawData.midPt, canvas); | 71 | drawData.planeMat, drawData.midPt, canvas); |
| 72 | 72 | ||