Merge branch 'master' of github.com:Semantic-Org/Semantic-UI

README.md

@@ -5,7 +5,7 @@ Semantic UI is under constant development, so **be sure to check out our [releas
 
 [![Flattr This](https://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=jlukic&url=https%3A%2F%2Fgithub.com%2Fjlukic%2FSemantic-UI)
 
-> Comunity contributed plugins and ports for Wordpress, Angular, Dart, Knockout, Rails, and more can be found on the [Integration page](https://github.com/Semantic-Org/Semantic-UI/wiki/Integration).
+> Community contributed plugins and ports for Wordpress, Angular, Dart, Knockout, Rails, and more can be found on the [Integration page](https://github.com/Semantic-Org/Semantic-UI/wiki/Integration).
 
 ## Translations
 

server/documents/modules/modal.html.eco

@@ -168,7 +168,7 @@ type        : 'UI Module'
 
     <div class="no example">
       <h4 class="ui header">Approve / Deny Callbacks</h4>
-      <p>Modals will automatically tie approve deny callbacks to any positive/approve or negative/deny buttons. If a callback returns false it will prevent the modal from closing</p>
+      <p>Modals will automatically tie approve deny callbacks to any positive/approve or negative/deny or ok/cancel buttons. If a callback returns false it will prevent the modal from closing</p>
       <div class="code" data-demo="true">
       $('.basic.modal')
         .modal('setting', {
@@ -444,7 +444,7 @@ type        : 'UI Module'
         <tr>
           <td>onDeny</td>
           <td>Modal</td>
-          <td>Is called after a negative or cancel button is pressed.</td>
+          <td>Is called after a negative or deny or cancel button is pressed.</td>
         </tr>
       </tbody>
     </table>
@@ -472,8 +472,8 @@ type        : 'UI Module'
             <div class="code">
       selector    : {
         close    : '.close, .actions .button',
-        approve  : '.actions .positive, .actions .approve',
-        deny     : '.actions .negative, .actions .cancel'
+        approve  : '.actions .positive, .actions .approve, .actions .ok',
+        deny     : '.actions .negative, .actions .deny, .actions .cancel'
       },
             </div>
           </td>
@@ -539,4 +539,4 @@ type        : 'UI Module'
     </table>
   </div>
 
-</div>
+</div>

src/modules/modal.js

@@ -678,8 +678,8 @@ $.fn.modal.settings = {
 
   selector    : {
     close    : '.close, .actions .button',
-    approve  : '.actions .positive, .actions .approve',
-    deny     : '.actions .negative, .actions .cancel',
+    approve  : '.actions .positive, .actions .approve, .actions .ok',
+    deny     : '.actions .negative, .actions .deny, .actions .cancel',
     modal    : '.ui.modal'
   },
   error : {
@@ -693,4 +693,4 @@ $.fn.modal.settings = {
 };
 
 
-})( jQuery, window , document );
+})( jQuery, window , document );