diff options
author | Jose Antonio Marquez | 2012-03-09 11:02:59 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-09 11:02:59 -0800 |
commit | ac6f5f7c39b59f8d4e3a15633ce0a08dac13ee70 (patch) | |
tree | 836c35064859d699deba29ea6fb0a90f3c6e6e35 /node_modules/montage/ui/popup | |
parent | 3bcdfaa322ac53609b66ecedbace1872048fd310 (diff) | |
parent | b4eb2f6cc1208fe5c18aa1f02a85adda25075d81 (diff) | |
download | ninja-ac6f5f7c39b59f8d4e3a15633ce0a08dac13ee70.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'node_modules/montage/ui/popup')
-rwxr-xr-x | node_modules/montage/ui/popup/confirm.reel/confirm.js | 4 | ||||
-rwxr-xr-x | node_modules/montage/ui/popup/popup.reel/popup.js | 159 |
2 files changed, 66 insertions, 97 deletions
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.js b/node_modules/montage/ui/popup/confirm.reel/confirm.js index 7e186e29..0fc5fea0 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.js +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.js | |||
@@ -115,7 +115,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon | |||
115 | this.okCallback.call(this, evt); | 115 | this.okCallback.call(this, evt); |
116 | } | 116 | } |
117 | var anEvent = document.createEvent("CustomEvent"); | 117 | var anEvent = document.createEvent("CustomEvent"); |
118 | anEvent.initCustomEvent("montage_confirm_ok", true, true); | 118 | anEvent.initCustomEvent("montage_confirm_ok", true, true, null); |
119 | this.dispatchEvent(anEvent); | 119 | this.dispatchEvent(anEvent); |
120 | 120 | ||
121 | this.popup.hide(); | 121 | this.popup.hide(); |
@@ -132,7 +132,7 @@ var Confirm = exports.Confirm = Montage.create(Component, /** @lends module:"mon | |||
132 | this.cancelCallback.call(this, evt); | 132 | this.cancelCallback.call(this, evt); |
133 | } | 133 | } |
134 | var anEvent = document.createEvent("CustomEvent"); | 134 | var anEvent = document.createEvent("CustomEvent"); |
135 | anEvent.initCustomEvent("montage_confirm_cancel", true, true); | 135 | anEvent.initCustomEvent("montage_confirm_cancel", true, true, null); |
136 | this.dispatchEvent(anEvent); | 136 | this.dispatchEvent(anEvent); |
137 | 137 | ||
138 | this.popup.hide(); | 138 | this.popup.hide(); |
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.js b/node_modules/montage/ui/popup/popup.reel/popup.js index f13a6aed..2a61e75e 100755 --- a/node_modules/montage/ui/popup/popup.reel/popup.js +++ b/node_modules/montage/ui/popup/popup.reel/popup.js | |||
@@ -27,6 +27,10 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
27 | // A Delegate to control positioning (and other features, in future) of the popup in a custom manner | 27 | // A Delegate to control positioning (and other features, in future) of the popup in a custom manner |
28 | delegate: {value: null}, | 28 | delegate: {value: null}, |
29 | 29 | ||
30 | /** | ||
31 | Internal property. | ||
32 | @private | ||
33 | */ | ||
30 | contentEl: { | 34 | contentEl: { |
31 | value: null | 35 | value: null |
32 | }, | 36 | }, |
@@ -34,66 +38,24 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
34 | Description TODO | 38 | Description TODO |
35 | @type {Property} | 39 | @type {Property} |
36 | @default {Container} null | 40 | @default {Container} null |
41 | @private | ||
37 | */ | 42 | */ |
38 | containerEl: { | 43 | containerEl: { |
39 | value: null | 44 | value: null |
40 | }, | 45 | }, |
41 | 46 | ||
42 | /** | 47 | |
43 | Description TODO | ||
44 | @private | ||
45 | */ | ||
46 | _pointer: { | ||
47 | value: true | ||
48 | }, | ||
49 | /** | ||
50 | Description TODO | ||
51 | @type {Function} | ||
52 | @default {Boolean} true | ||
53 | */ | ||
54 | pointer: { | ||
55 | get: function() { | ||
56 | return this._pointer; | ||
57 | }, | ||
58 | set: function(value) { | ||
59 | if (this._pointer !== value) { | ||
60 | this._pointer = value; | ||
61 | this.needsDraw = true; | ||
62 | } | ||
63 | } | ||
64 | }, | ||
65 | /** | ||
66 | Description TODO | ||
67 | @private | ||
68 | */ | ||
69 | _boxed: { | ||
70 | value: true | ||
71 | }, | ||
72 | /** | ||
73 | Description TODO | ||
74 | @type {Function} | ||
75 | @default {Boolean} true | ||
76 | */ | ||
77 | boxed: { | ||
78 | get: function() { | ||
79 | return this._boxed; | ||
80 | }, | ||
81 | set: function(value) { | ||
82 | if (this._boxed !== value) { | ||
83 | this._boxed = value; | ||
84 | this.needsDraw = true; | ||
85 | } | ||
86 | } | ||
87 | }, | ||
88 | /** | 48 | /** |
89 | Description TODO | 49 | Description TODO |
90 | @private | 50 | @private |
91 | */ | 51 | */ |
92 | _slot: {value: null}, | 52 | _slot: {value: null}, |
93 | /** | 53 | /** |
54 | |||
94 | Description TODO | 55 | Description TODO |
95 | @type {Function} | 56 | @type {Function} |
96 | @default null | 57 | @default null |
58 | @private | ||
97 | */ | 59 | */ |
98 | slot: { | 60 | slot: { |
99 | get: function() { | 61 | get: function() { |
@@ -112,7 +74,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
112 | */ | 74 | */ |
113 | _content: {value: null}, | 75 | _content: {value: null}, |
114 | /** | 76 | /** |
115 | Description TODO | 77 | The Montage component that will be shown in this popup. |
78 | |||
116 | @type {Function} | 79 | @type {Function} |
117 | @default null | 80 | @default null |
118 | */ | 81 | */ |
@@ -137,7 +100,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
137 | */ | 100 | */ |
138 | _modal: { value: false }, | 101 | _modal: { value: false }, |
139 | /** | 102 | /** |
140 | Description TODO | 103 | If true, the Popup will be rendered as a Modal. |
104 | |||
141 | @type {Function} | 105 | @type {Function} |
142 | @default {Boolean} false | 106 | @default {Boolean} false |
143 | */ | 107 | */ |
@@ -156,8 +120,10 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
156 | } | 120 | } |
157 | }, | 121 | }, |
158 | 122 | ||
159 | // An Object wtih values {top, left}. Set it only if the popup should display at a | 123 | /** |
160 | // given location instead of anchoring it to a anchor element or at the center of the screen. | 124 | An Object wtih values {top, left}. Set it only if the popup should display at a |
125 | given location always. | ||
126 | */ | ||
161 | _position: {value: null}, | 127 | _position: {value: null}, |
162 | position: { | 128 | position: { |
163 | get: function() { | 129 | get: function() { |
@@ -169,8 +135,12 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
169 | } | 135 | } |
170 | }, | 136 | }, |
171 | 137 | ||
138 | /** | ||
139 | * Number of milliseconds after which the Popup must be dismissed. Default is 0. | ||
140 | */ | ||
172 | autoDismiss: { value: 0 }, | 141 | autoDismiss: { value: 0 }, |
173 | 142 | ||
143 | /** @private */ | ||
174 | _displayed: { value: false }, | 144 | _displayed: { value: false }, |
175 | displayed: { | 145 | displayed: { |
176 | get: function() { | 146 | get: function() { |
@@ -204,9 +174,10 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
204 | 174 | ||
205 | 175 | ||
206 | /** | 176 | /** |
177 | Internal method. | ||
207 | @private | 178 | @private |
208 | */ | 179 | */ |
209 | _getPosition: { | 180 | _getElementPosition: { |
210 | value: function(obj) { | 181 | value: function(obj) { |
211 | var curleft = 0, curtop = 0, curHt = 0, curWd = 0; | 182 | var curleft = 0, curtop = 0, curHt = 0, curWd = 0; |
212 | if (obj.offsetParent) { | 183 | if (obj.offsetParent) { |
@@ -222,16 +193,21 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
222 | } | 193 | } |
223 | }, | 194 | }, |
224 | 195 | ||
225 | _calculatePosition: { | 196 | _positionPopup: { |
226 | value: function() { | 197 | value: function() { |
227 | var pos, delegate = this.delegate, anchor = this.anchor, type = this.type; | 198 | var position, delegate = this.delegate, anchor = this.anchor, type = this.type; |
228 | 199 | ||
229 | if(delegate && (typeof delegate.positionPopup === 'function')) { | 200 | // if a delegate is provided, use that to get the position |
201 | if(delegate && (typeof delegate.willPositionPopup === 'function')) { | ||
230 | var anchorPosition; | 202 | var anchorPosition; |
231 | if(anchor) { | 203 | if(anchor) { |
232 | anchorPosition = this._getPosition(anchor); | 204 | anchorPosition = this._getElementPosition(anchor); |
233 | } | 205 | } |
234 | pos = delegate.positionPopup(this, anchor, anchorPosition); | 206 | position = delegate.willPositionPopup(this, anchor, anchorPosition); |
207 | } else if(this.position !== null) { | ||
208 | // If a position has been specified but no delegate has been provided | ||
209 | // we assume that the position is static and hence use that | ||
210 | position = this.position; | ||