diff options
author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/controllers/elements/shapes-controller.js | |
parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/controllers/elements/shapes-controller.js')
-rwxr-xr-x | js/controllers/elements/shapes-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index e9a5f865..38f133b5 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
@@ -213,7 +213,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
213 | default: | 213 | default: |
214 | CanvasController.setProperty(el, p, value); | 214 | CanvasController.setProperty(el, p, value); |
215 | } | 215 | } |
216 | this.application.ninja.documentController.activeDocument.needsSave = true; | 216 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
217 | } | 217 | } |
218 | }, | 218 | }, |
219 | 219 | ||
@@ -559,7 +559,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
559 | } | 559 | } |
560 | } | 560 | } |
561 | el.elementModel.shapeModel.GLWorld.render(); | 561 | el.elementModel.shapeModel.GLWorld.render(); |
562 | this.application.ninja.documentController.activeDocument.needsSave = true; | 562 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
563 | } | 563 | } |
564 | }, | 564 | }, |
565 | 565 | ||