aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel/CSSPanelBase.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-11 11:17:41 -0700
committerArmen Kesablyan2012-06-11 11:17:41 -0700
commit278769df00ced8620fd73371e38fe2e43f07ca3b (patch)
treedeb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/panels/CSSPanel/CSSPanelBase.reel
parent555fd6efa605b937800b3979a4c68fa7eb8666ae (diff)
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
downloadninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/CSSPanel/CSSPanelBase.reel')
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js29
1 files changed, 21 insertions, 8 deletions
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
index b4a803b2..b496ce4a 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js
@@ -57,11 +57,6 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
57 57
58 this.eventManager.addEventListener("selectionChange", this, true); 58 this.eventManager.addEventListener("selectionChange", this, true);
59 this.eventManager.addEventListener("elementChange", this, true); 59 this.eventManager.addEventListener("elementChange", this, true);
60 this.eventManager.addEventListener("openDocument", this, true);
61
62 if(this.application.ninja.currentDocument) {
63 this.captureOpenDocument();
64 }
65 60
66 this.addEventListener('webkitTransitionEnd', this, false); 61 this.addEventListener('webkitTransitionEnd', this, false);
67 ['sheets', 'styles'].forEach(function(section) { 62 ['sheets', 'styles'].forEach(function(section) {
@@ -73,11 +68,29 @@ var CSSPanel = exports.CSSPanelBase = (require("montage/core/core").Montage).cre
73 this._setUpToolbars(); 68 this._setUpToolbars();
74 } 69 }
75 }, 70 },
76 captureOpenDocument : { 71
77 value : function(e) { 72 _currentDocument: {
78 this.populateStyleSheetList(); 73 value : null,
74 enumerable : false
75 },
76
77 currentDocument : {
78 get : function() {
79 return this._currentDocument;
80 },
81 set : function(value) {
82 if (value === this._currentDocument) {
83 return;
84 }
85
86 this._currentDocument = value;
87
88 if(this._currentDocument.currentView === "design") {
89 this.populateStyleSheetList();
90 }
79 } 91 }
80 }, 92 },
93
81 handleWebkitTransitionEnd : { 94 handleWebkitTransitionEnd : {
82 value: function(e) { 95 value: function(e) {
83 //console.log('transition end at panel base'); 96 //console.log('transition end at panel base');