aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer.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/PanelContainer.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/PanelContainer.reel')
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html21
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js41
2 files changed, 39 insertions, 23 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index 1c144bf4..b22b3609 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -17,6 +17,9 @@
17 "prototype": "js/panels/Panel.reel", 17 "prototype": "js/panels/Panel.reel",
18 "properties": { 18 "properties": {
19 "element": {"#": "panel_0"} 19 "element": {"#": "panel_0"}
20 },
21 "bindings": {
22 "currentDocument": {"<-": "@owner.currentDocument"}
20 } 23 }
21 }, 24 },
22 25
@@ -24,6 +27,9 @@
24 "prototype": "js/panels/Panel.reel", 27 "prototype": "js/panels/Panel.reel",
25 "properties": { 28 "properties": {
26 "element": {"#": "panel_1"} 29 "element": {"#": "panel_1"}
30 },
31 "bindings": {
32 "currentDocument": {"<-": "@owner.currentDocument"}
27 } 33 }
28 }, 34 },
29 35
@@ -31,6 +37,9 @@
31 "prototype": "js/panels/Panel.reel", 37 "prototype": "js/panels/Panel.reel",
32 "properties": { 38 "properties": {
33 "element": {"#": "panel_2"} 39 "element": {"#": "panel_2"}
40 },
41 "bindings": {
42 "currentDocument": {"<-": "@owner.currentDocument"}
34 } 43 }
35 }, 44 },
36 45
@@ -38,6 +47,9 @@
38 "prototype": "js/panels/Panel.reel", 47 "prototype": "js/panels/Panel.reel",
39 "properties": { 48 "properties": {
40 "element": {"#": "panel_3"} 49 "element": {"#": "panel_3"}
50 },
51 "bindings": {
52 "currentDocument": {"<-": "@owner.currentDocument"}
41 } 53 }
42 }, 54 },
43 55
@@ -45,6 +57,9 @@
45 "prototype": "js/panels/Panel.reel", 57 "prototype": "js/panels/Panel.reel",
46 "properties": { 58 "properties": {
47 "element": {"#": "panel_4"} 59 "element": {"#": "panel_4"}
60 },
61 "bindings": {
62 "currentDocument": {"<-": "@owner.currentDocument"}
48 } 63 }
49 }, 64 },
50 65
@@ -52,6 +67,9 @@
52 "prototype": "js/panels/Panel.reel", 67 "prototype": "js/panels/Panel.reel",
53 "properties": { 68 "properties": {
54 "element": {"#": "panel_5"} 69 "element": {"#": "panel_5"}
70 },
71 "bindings": {
72 "currentDocument": {"<-": "@owner.currentDocument"}
55 } 73 }
56 }, 74 },
57 75
@@ -60,6 +78,9 @@
60 "name": "Panel", 78 "name": "Panel",
61 "properties": { 79 "properties": {
62 "element": {"#": "panel_6"} 80 "element": {"#": "panel_6"}
81 },
82 "bindings": {
83 "currentDocument": {"<-": "@owner.currentDocument"}
63 } 84 }
64 }, 85 },
65 86
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js
index 8d1d6a5e..7cb03255 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -16,7 +16,24 @@ exports.PanelContainer = Montage.create(Component, {
16 value: null 16 value: null
17 }, 17 },
18 18
19 // This will hold the current loaded panels. 19 _currentDocument: {
20 value : null,
21 enumerable : false
22 },
23
24 currentDocument : {
25 get : function() {
26 return this._currentDocument;
27 },
28 set : function(value) {
29 if (value === this._currentDocument) {
30 return;
31 }
32
33 this._currentDocument = value;
34 }
35 },
36
20 panels: { 37 panels: {
21 value: [] 38 value: []
22 }, 39 },
@@ -64,10 +81,6 @@ exports.PanelContainer = Montage.create(Component, {
64 } 81 }
65 82
66 this.application.localStorage.setItem("panels", this.currentPanelState); 83 this.application.localStorage.setItem("panels", this.currentPanelState);
67
68
69 this.eventManager.addEventListener( "onOpenDocument", this, false);
70 this.eventManager.addEventListener( "closeDocument", this, false);
71 } 84 }
72 }, 85 },
73 86
@@ -89,24 +102,6 @@ exports.PanelContainer = Montage.create(Component, {
89 } 102 }
90 }, 103 },
91 104
92 handleOnOpenDocument: {
93 value: function(){
94 this.panels.forEach(function(obj) {
95 obj.disabled = false;
96 });
97 }
98 },
99
100 handleCloseDocument: {
101 value: function(){
102 if(!this.application.ninja.documentController.activeDocument) {
103 this.panels.forEach(function(obj) {
104 obj.disabled = true;
105 });
106 }
107 }
108 },
109
110 handleDropped: { 105 handleDropped: {
111 value: function(e) { 106 value: function(e) {
112 var draggedIndex, droppedIndex = 0, len = this.panels.length; 107 var draggedIndex, droppedIndex = 0, len = this.panels.length;