diff options
author | Kruti Shah | 2012-06-12 13:09:11 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-12 13:09:11 -0700 |
commit | d648c842905c7c53e0f89b943982493d2b79f56e (patch) | |
tree | eb5585f92061975215f6d19305a8d1b76262e2fc /js/models/app-model.js | |
parent | bedb38e14887b29eae3cdf1c8d435259c920257c (diff) | |
parent | cf3b96822665751dae7a64644db3cb3960733c3d (diff) | |
download | ninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/document/_toDelete/html-document.js
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/models/app-model.js')
-rwxr-xr-x | js/models/app-model.js | 26 |
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 | ||
10 | exports.AppModel = Montage.create(Component, { | 10 | exports.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 | }, |