Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Commit

Permalink
Revert "Merge pull request #5142 from MauriceG/patch-11"
Browse files Browse the repository at this point in the history
This reverts commit 34a32ee.
  • Loading branch information
Gabriel Schulhof committed Oct 11, 2012
1 parent 34a32ee commit f9b5293
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
5 changes: 0 additions & 5 deletions docs/api/data-attributes.html
Expand Up @@ -495,11 +495,6 @@ <h2><a href="../pages/popup/">Popup</a></h2>
<th>data-corners</th>
<td><strong>true</strong> | false</td>
</tr>
<tr>
<th>data-dismissable</th>
<td><strong>true</strong> | false - If set to false prevents popup closing by clicking outside of the popup or pressing the Escape key</td>
</tr>

<tr>
<th>data-overlay-theme</th>
<td>swatch letter (a-z) - Default "null" (transparent background)</td>
Expand Down
10 changes: 2 additions & 8 deletions docs/pages/popup/index.html
Expand Up @@ -167,14 +167,14 @@ <h2>Calling the popup plugin</h2>

<h2>Opening popups</h2>

<p>Using the markup-based configuration, when a link with the <code>data-rel="popup"</code> is tapped, the corresponding popup container with the <code>id</code> referenced in the <code>href</code> of the link will be shown. To open a popup programmatically, call popup with the <code>open</code> method on the popup container:</p>
<p>Using the markup-based configuration, when a link with the <code>data-rel="popup"</code> is tapped, the corresponding popup container with the id referenced in the <code>href</code> of the link will be shown. To open a popup programmatically, call popup with the <code>open</code> method on the popup container:</p>

<pre><code>
$( "#myPopupDiv" ).popup( "open" )
</code></pre>

<h2>Closing popups</h2>
<p>By default popups can be closed either by clicking outside the popup widget or by pressing the <code>Esc</code> key. To prevent this, the <code>data-dismissable="false"</code> attribute can be added to the popup. Popups can also be closed via the <code>close</code> method:</p>
<p>Popups can be closed either by clicking outside the popup widget or by pressing the <code>Esc</code> key. Popups can also be closed via the <code>close</code> method:</p>

<pre><code>
$( "#myPopupDiv" ).popup( "close" )
Expand All @@ -192,7 +192,6 @@ <h2>Closing popups</h2>

<a href="#popupCloseRight" data-rel="popup" data-role="button" data-inline="true">Popup with close button right</a>
<a href="#popupCloseLeft" data-rel="popup" data-role="button" data-inline="true">Popup with close button left</a>
<a href="#popupUndismissable" data-rel="popup" data-role="button" data-inline="true">Undismissable Popup</a>

<div data-role="popup" id="popupCloseRight" class="ui-content" style="max-width:280px">
<a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>
Expand All @@ -204,11 +203,6 @@ <h2>Closing popups</h2>
<p>I have a close button at the top left corner with simple HTML markup.</p>
</div>

<div data-role="popup" id="popupUndismissable" class="ui-content" style="max-width:280px" data-dismissable="false">
<a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-left">Close</a>
<p>I have the <code>data-dismissable</code> attribute set to <code>false</code>. I'm not closeable be clicking outside of me.</p>
</div>

<h2>Adding padding</h2>
<p>For popups with formatted text, padding is needed. We recommend adding the <code>ui-content</code> class to the popup container which adds the standard 15px of padding, just like the page content container. Write your own styles to create a more customized design if needed.</p>

Expand Down

0 comments on commit f9b5293

Please sign in to comment.