aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel
diff options
context:
space:
mode:
authorKruti Shah2012-06-12 13:09:11 -0700
committerKruti Shah2012-06-12 13:09:11 -0700
commitd648c842905c7c53e0f89b943982493d2b79f56e (patch)
treeeb5585f92061975215f6d19305a8d1b76262e2fc /js/panels/Panel.reel
parentbedb38e14887b29eae3cdf1c8d435259c920257c (diff)
parentcf3b96822665751dae7a64644db3cb3960733c3d (diff)
downloadninja-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/panels/Panel.reel')
-rwxr-xr-xjs/panels/Panel.reel/Panel.js29
1 files changed, 29 insertions, 0 deletions
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 613bef4b..0c5f0b4b 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -100,6 +100,35 @@ exports.Panel = Montage.create(Component, {
100 } 100 }
101 }, 101 },
102 102
103 _currentDocument: {
104 value : null,
105 enumerable : false
106 },
107
108 currentDocument : {
109 get : function() {
110 return this._currentDocument;
111 },
112 set : function(value) {
113 if (value === this._currentDocument) {
114 return;
115 }
116
117 this._currentDocument = value;
118
119 if(typeof this.panelContent.content[0].controller._currentDocument !== "undefined") {
120 this.panelContent.content[0].controller.currentDocument = this._currentDocument;
121 }
122
123 if(!value) {
124 this.disabled = true;
125 } else {
126 this.disabled = this._currentDocument.currentView !== "design";
127 }
128
129 }
130 },
131
103 handleBtnCollapseAction: { 132 handleBtnCollapseAction: {
104 value: function() { 133 value: function() {
105 this.collapsed = !this.collapsed; 134 this.collapsed = !this.collapsed;