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/LineTool.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/LineTool.js')
| -rwxr-xr-x[-rw-r--r--] | js/tools/LineTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 99c374a7..233316a5 100644..100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
| @@ -82,7 +82,7 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
| 82 | h += ~~(yAdj*2); | 82 | h += ~~(yAdj*2); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", null, true); | 85 | canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); |
| 86 | var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas); | 86 | var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas); |
| 87 | 87 | ||
| 88 | ElementMediator.addElement(canvas, elementModel.data, true); | 88 | ElementMediator.addElement(canvas, elementModel.data, true); |