aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-04 10:37:29 -0700
committerPushkar Joshi2012-06-04 10:37:29 -0700
commitf1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch)
tree796931014054ad6b0647854183f632ffd72ed9ee /js/models
parent06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff)
parentc1ec69879028220b0c3f11ad6e24035bf527802c (diff)
downloadninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz
Merge branch 'master' into pentool
Conflicts: js/tools/PenTool.js
Diffstat (limited to 'js/models')
-rwxr-xr-xjs/models/app-model.js26
1 files changed, 26 insertions, 0 deletions
diff --git a/js/models/app-model.js b/js/models/app-model.js
index 1c599a32..ceba653e 100755
--- a/js/models/app-model.js
+++ b/js/models/app-model.js
@@ -9,6 +9,32 @@ var Montage = require("montage/core/core").Montage,
9 9
10exports.AppModel = Montage.create(Component, { 10exports.AppModel = Montage.create(Component, {
11 11
12 _currentDocument: {
13 value : null
14 },
15
16 currentDocument : {
17 get : function() {
18 return this._currentDocument;
19 },
20 set : function(value) {
21 if (value === this._currentDocument) {
22 return;
23 }
24
25 if(this._currentDocument && this._currentDocument.currentView === "design") {
26 this._currentDocument.model.draw3DGrid = this.show3dGrid;
27 }
28
29 this._currentDocument = value;
30
31 if(this._currentDocument && this._currentDocument.currentView === "design") {
32 this.show3dGrid = this._currentDocument.model.draw3DGrid;
33 }
34
35 }
36 },
37
12 _livePreview: { 38 _livePreview: {
13 value: false 39 value: false
14 }, 40 },