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/BrushTool.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/BrushTool.js')
| -rw-r--r-- | js/tools/BrushTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js index 97df84a0..9a0ad583 100644 --- a/js/tools/BrushTool.js +++ b/js/tools/BrushTool.js | |||
| @@ -208,7 +208,7 @@ exports.BrushTool = Montage.create(ShapeTool, { | |||
| 208 | var top = Math.round(midPt[1] - 0.5 * h); | 208 | var top = Math.round(midPt[1] - 0.5 * h); |
| 209 | 209 | ||
| 210 | if (!canvas) { | 210 | if (!canvas) { |
| 211 | var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", null, true); | 211 | var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true); |
| 212 | var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas); | 212 | var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas); |
| 213 | ElementMediator.addElement(newCanvas, elementModel.data, true); | 213 | ElementMediator.addElement(newCanvas, elementModel.data, true); |
| 214 | 214 | ||