diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/treeview | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/treeview')
6 files changed, 29 insertions, 29 deletions
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html index 7f5610b1..abc2cc57 100644 --- a/js/components/treeview/branch.reel/branch.html +++ b/js/components/treeview/branch.reel/branch.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html index 750efe8a..58495b58 100644 --- a/js/components/treeview/leaf.reel/leaf.html +++ b/js/components/treeview/leaf.reel/leaf.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | </copyright> --> | 30 | </copyright> --> |
31 | <html lang="en"> | 31 | <html lang="en"> |
32 | <head> | 32 | <head> |
33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
34 | <link href="leaf.css" rel="stylesheet" type="text/css" /> | 34 | <link href="leaf.css" rel="stylesheet" type="text/css" /> |
35 | <script type="text/montage-serialization"> | 35 | <script type="text/montage-serialization"> |
36 | { | 36 | { |
@@ -54,8 +54,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
54 | } | 54 | } |
55 | } | 55 | } |
56 | } | 56 | } |
57 | } | 57 | } |
58 | </script> | 58 | </script> |
59 | </head> | 59 | </head> |
60 | <body> | 60 | <body> |
61 | <div data-montage-id="leaf" class="leaf"> | 61 | <div data-montage-id="leaf" class="leaf"> |
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html index 52cd97b4..54f2f0d7 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.html +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
@@ -160,9 +160,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
160 | <div data-montage-id="branchCollapser" class="branchCollapser"> | 160 | <div data-montage-id="branchCollapser" class="branchCollapser"> |
161 | <ul data-montage-id="branchList"> | 161 | <ul data-montage-id="branchList"> |
162 | <li data-montage-id="treeItem"></li> | 162 | <li data-montage-id="treeItem"></li> |
163 | </ul> | 163 | </ul> |
164 | </div> | 164 | </div> |
165 | 165 | ||
166 | </div> | 166 | </div> |
167 | </body> | 167 | </body> |
168 | </html> | 168 | </html> |
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: { |
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html index 2ec7f79b..37502b28 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | </copyright> --> | 30 | </copyright> --> |
31 | <html lang="en"> | 31 | <html lang="en"> |
32 | <head> | 32 | <head> |
33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
34 | <link href="ninja-leaf.css" rel="stylesheet" type="text/css" /> | 34 | <link href="ninja-leaf.css" rel="stylesheet" type="text/css" /> |
35 | <script type="text/montage-serialization"> | 35 | <script type="text/montage-serialization"> |
36 | { | 36 | { |
@@ -54,8 +54,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
54 | } | 54 | } |
55 | } | 55 | } |
56 | } | 56 | } |
57 | } | 57 | } |
58 | </script> | 58 | </script> |
59 | </head> | 59 | </head> |
60 | <body> | 60 | <body> |
61 | <div data-montage-id="leaf" class="leaf"> | 61 | <div data-montage-id="leaf" class="leaf"> |
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html index d1621d50..ef0d6a24 100644 --- a/js/components/treeview/treeview.reel/treeview.html +++ b/js/components/treeview/treeview.reel/treeview.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
30 | </copyright> --> | 30 | </copyright> --> |
31 | <html lang="en"> | 31 | <html lang="en"> |
32 | <head> |