Skip to content

Commit cd2aeee

Browse files
authored
Merge pull request mgcrea#2191 from madflow/doc-update
docs(affix): mgcrea#1356 offsetParent, docs(modal): fixed botched html
2 parents 0b51f2b + aef1b29 commit cd2aeee

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/affix/docs/affix.demo.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,13 @@ <h3>Options</h3>
6565
</tr>
6666
<tr>
6767
<td>offsetParent</td>
68-
<td>number</td>
69-
<td>0</td>
70-
<td>Pixels to offset from parent when calculating position of scroll.</td>
68+
<td>number | HTML string | DOMElement</td>
69+
<td></td>
70+
<td>
71+
If provided, the affix will be positioned relative to a parent element.
72+
If a numeric value is present, the affix will try to find a parent that is N parents "up" in the DOM tree.
73+
If a non-numeric value is provided, the value is treated as an HTML string or DOMElement and constructed via angular.element(element).
74+
</td>
7175
</tr>
7276
<tr>
7377
<td>offsetUnpin</td>

src/modal/docs/modal.demo.html

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,14 @@ <h3>Options</h3>
268268
<p>If provided, this function will be invoked before the modal is hidden.</p>
269269
</td>
270270
</tr>
271-
<td>zIndex</td>
272-
+ <td>number</td>
273-
+ <td>1050</td>
274-
+ <td>
275-
+ CSS z-index value for the modal.
276-
+ </td>
277-
+ </tr>
271+
<tr>
272+
<td>zIndex</td>
273+
<td>number</td>
274+
<td>1050</td>
275+
<td>
276+
CSS z-index value for the modal.
277+
</td>
278+
</tr>
278279
</tbody>
279280
</table>
280281
</div>

0 commit comments

Comments
 (0)