diff options
author | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 00:45:26 -0700 |
commit | c59eb371559a3061ce53223e249ca97daace5968 (patch) | |
tree | f9540e26c0f273d35f92010605da65dd85bbe70c /node_modules/montage/ui/popup/popup.reel/popup.js | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
download | ninja-c59eb371559a3061ce53223e249ca97daace5968.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'node_modules/montage/ui/popup/popup.reel/popup.js')
-rwxr-xr-x | node_modules/montage/ui/popup/popup.reel/popup.js | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.js b/node_modules/montage/ui/popup/popup.reel/popup.js index 84f845db..0ed1a452 100755 --- a/node_modules/montage/ui/popup/popup.reel/popup.js +++ b/node_modules/montage/ui/popup/popup.reel/popup.js | |||
@@ -22,9 +22,14 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
22 | hasTemplate: {value: true}, | 22 | hasTemplate: {value: true}, |
23 | 23 | ||
24 | // the HTML Element to which the popup must be anchored to | 24 | // the HTML Element to which the popup must be anchored to |
25 | anchorElement: {value: null}, | 25 | anchorElement: { |
26 | value: null | ||
27 | }, | ||
28 | |||
29 | _anchor: { | ||
30 | value: null | ||
31 | }, | ||
26 | 32 | ||
27 | _anchor: {value: null}, | ||
28 | /** | 33 | /** |
29 | * The HTMLElement or Montage Component that the popup must be anchored to | 34 | * The HTMLElement or Montage Component that the popup must be anchored to |
30 | */ | 35 | */ |
@@ -42,7 +47,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
42 | this.anchorElement = value.element; | 47 | this.anchorElement = value.element; |
43 | } | 48 | } |
44 | } | 49 | } |
45 | } | 50 | }, |
51 | serializable: true | ||
46 | }, | 52 | }, |
47 | 53 | ||
48 | // A Delegate to control positioning (and other features, in future) of the popup in a custom manner | 54 | // A Delegate to control positioning (and other features, in future) of the popup in a custom manner |
@@ -53,7 +59,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
53 | @private | 59 | @private |
54 | */ | 60 | */ |
55 | contentEl: { | 61 | contentEl: { |
56 | value: null | 62 | value: null, |
63 | serializable: true | ||
57 | }, | 64 | }, |
58 | /** | 65 | /** |
59 | Description TODO | 66 | Description TODO |
@@ -62,7 +69,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
62 | @private | 69 | @private |
63 | */ | 70 | */ |
64 | containerEl: { | 71 | containerEl: { |
65 | value: null | 72 | value: null, |
73 | serializable: true | ||
66 | }, | 74 | }, |
67 | 75 | ||
68 | 76 | ||
@@ -87,7 +95,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
87 | if (this.content) { | 95 | if (this.content) { |
88 | this._slot.content = this.content; | 96 | this._slot.content = this.content; |
89 | } | 97 | } |
90 | } | 98 | }, |
99 | serializable: true | ||
91 | }, | 100 | }, |
92 | /** | 101 | /** |
93 | Description TODO | 102 | Description TODO |
@@ -113,7 +122,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
113 | // set the popup property of the content. | 122 | // set the popup property of the content. |
114 | this._content.popup = this; | 123 | this._content.popup = this; |
115 | this.needsDraw = true; | 124 | this.needsDraw = true; |
116 | } | 125 | }, |
126 | serializable: true | ||
117 | }, | 127 | }, |
118 | /** | 128 | /** |
119 | Description TODO | 129 | Description TODO |
@@ -138,7 +148,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
138 | this._modal = value; | 148 | this._modal = value; |
139 | this.needsDraw = true; | 149 | this.needsDraw = true; |
140 | } | 150 | } |
141 | } | 151 | }, |
152 | serializable: true | ||
142 | }, | 153 | }, |
143 | 154 | ||
144 | /** | 155 | /** |
@@ -153,7 +164,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
153 | set: function(pos) { | 164 | set: function(pos) { |
154 | this._position = pos; | 165 | this._position = pos; |
155 | //this.needsDraw = true; | 166 | //this.needsDraw = true; |
156 | } | 167 | }, |
168 | serializable: true | ||
157 | }, | 169 | }, |
158 | 170 | ||
159 | /** | 171 | /** |
@@ -172,14 +184,15 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
172 | this.needsDraw = true; | 184 | this.needsDraw = true; |
173 | } | 185 | } |
174 | this._displayed = value; | 186 | this._displayed = value; |
175 | 187 | }, | |
176 | } | 188 | serializable: true |
177 | }, | 189 | }, |
178 | 190 | ||
179 | focusOnShow: { | 191 | focusOnShow: { |
180 | value: true | 192 | value: true, |
193 | serializable: true | ||
181 | }, | 194 | }, |
182 | 195 | ||
183 | /** | 196 | /** |
184 | Description TODO | 197 | Description TODO |
185 | @function | 198 | @function |