diff options
Diffstat (limited to 'js/components/treeview')
-rw-r--r-- | js/components/treeview/ninja-branch.reel/ninja-branch.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.js b/js/components/treeview/ninja-branch.reel/ninja-branch.js index f92a09bc..b4a096e3 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.js +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.js | |||
@@ -71,7 +71,7 @@ var Branch = exports.Branch = Montage.create(TreeNode, { | |||
71 | value: function() { | 71 | value: function() { |
72 | this.collapser.removeAttribute('id'); | 72 | this.collapser.removeAttribute('id'); |
73 | this.label._element.addEventListener('click', this, false); | 73 | this.label._element.addEventListener('click', this, false); |
74 | 74 | ||
75 | if(this.hideLabel) { | 75 | if(this.hideLabel) { |
76 | this.label.element.style.display = "none"; | 76 | this.label.element.style.display = "none"; |
77 | } | 77 | } |
@@ -81,17 +81,17 @@ var Branch = exports.Branch = Montage.create(TreeNode, { | |||
81 | }, | 81 | }, |
82 | handleWebkitTransitionEnd : { | 82 | handleWebkitTransitionEnd : { |
83 | value: function(e) { | 83 | value: function(e) { |
84 | e.stopPropagation(); | 84 | e.stopPropagation(); |
85 | 85 | ||
86 | ///// Remove Transition | 86 | ///// Remove Transition |
87 | this._removeTransition = true; | 87 | this._removeTransition = true; |
88 | this.collapser.removeEventListener('webkitTransitionEnd', this, false); | 88 | this.collapser.removeEventListener('webkitTransitionEnd', this, false); |
89 | 89 | ||
90 | //// If it's an expand transition, restore height to auto | 90 | //// If it's an expand transition, restore height to auto |
91 | if(this.isExpanded) { | 91 | if(this.isExpanded) { |
92 | this._switchToAuto = true; | 92 | this._switchToAuto = true; |
93 | } | 93 | } |
94 | 94 | ||
95 | this.needsDraw = true; | 95 | this.needsDraw = true; |
96 | 96 | ||
97 | } | 97 | } |
@@ -114,9 +114,9 @@ var Branch = exports.Branch = Montage.create(TreeNode, { | |||
114 | if (this.sourceObject[this.labelKey]) { | 114 | if (this.sourceObject[this.labelKey]) { |
115 | this._labelText = this.sourceObject[this.labelKey]; | 115 | this._labelText = this.sourceObject[this.labelKey]; |
116 | } | 116 | } |
117 | 117 | ||
118 | if(this._doCollapse) { | 118 | if(this._doCollapse) { |
119 | if (this._step === 0) { | 119 | if (this._step === 0) { |
120 | this.collapser.style.height = this.branchHeight; | 120 | this.collapser.style.height = this.branchHeight; |
121 | this.collapser.style.position = "relative"; | 121 | this.collapser.style.position = "relative"; |
122 | this.collapser.style.overflow = 'hidden'; | 122 | this.collapser.style.overflow = 'hidden'; |
@@ -135,15 +135,15 @@ var Branch = exports.Branch = Montage.create(TreeNode, { | |||
135 | } | 135 | } |
136 | } else if(this._doExpand) { | 136 | } else if(this._doExpand) { |
137 | this.collapser.style.height = this.branchHeight; | 137 | this.collapser.style.height = this.branchHeight; |
138 | 138 | ||
139 | this._doExpand = false; | 139 | this._doExpand = false; |
140 | } | 140 | } |
141 | if(this._switchToAuto) { | 141 | if(this._switchToAuto) { |
142 | this.collapser.childNodes[1].style.position = 'static'; | 142 | this.collapser.childNodes[1].style.position = 'static'; |
143 | this.collapser.style.height = 'auto'; | 143 | this.collapser.style.height = 'auto'; |
144 | this._switchToAuto = false; | 144 | this._switchToAuto = false; |
145 | } | 145 | } |
146 | 146 | ||
147 | if(this._removeTransition) { | 147 | if(this._removeTransition) { |
148 | this.collapser.classList.remove(this.collapseClass); | 148 | this.collapser.classList.remove(this.collapseClass); |
149 | this._removeTransition = false; | 149 | this._removeTransition = false; |
@@ -167,7 +167,7 @@ var Branch = exports.Branch = Montage.create(TreeNode, { | |||
167 | }, | 167 | }, |
168 | collapse : { | 168 | collapse : { |
169 | value: function() { | 169 | value: function() { |
170 | this.needsDraw = this._doCollapse = true; | 170 | this.needsDraw = this._doCollapse = true; |
171 | } | 171 | } |
172 | }, | 172 | }, |
173 | branchHeight: { | 173 | branchHeight: { |