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

10 years ago · fe76f8c6c3
4 changed files with 6 additions and 5 deletions
--- a/server/documents/modules/modal.html.eco
+++ b/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 or ok/cancel 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, 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', {
@ -450,12 +450,12 @@ type        : 'UI Module'
        <tr>
          <td>onApprove</td>
          <td>Modal</td>
-          <td>Is called after a positive or approve button is pressed</td>
+          <td>Is called after a positive, approve or ok button is pressed</td>
        </tr>
        <tr>
          <td>onDeny</td>
          <td>Modal</td>
-          <td>Is called after a negative or deny or cancel button is pressed.</td>
+          <td>Is called after a negative, deny or cancel button is pressed.</td>
        </tr>
      </tbody>
    </table>
--- a/server/layouts/default.html.eco
+++ b/server/layouts/default.html.eco
@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html>
 <head>
 <% uiIntroduction    = @getCollection("documents").findAll({type: $in: ['UI Introduction']},[{title: 1}]).toJSON() %>
 <% uiProject         = @getCollection("documents").findAll({type: $in: ['Semantic Project']},[{title: 1}]).toJSON() %>
--- a/spec/modal.commented.js
+++ b/spec/modal.commented.js
@ -606,7 +606,7 @@ $.fn.modal = function(parameters) {
        // Invoke is used to match internal functions to string lookups.
        // `$('.foo').example('invoke', 'set text', 'Foo')`
        // Method lookups are lazy, looking for many variations of a search string
-        // For example 'set active', will look for both `setText : function(){}`, `set: { text: function(){} }`
+        // For example 'set text', will look for both `setText : function(){}`, `set: { text: function(){} }`
        // Invoke attempts to preserve the 'this' chaining unless a value is returned.
        // If multiple values are returned an array of values matching up to the length of the selector is returned
        invoke: function(query, passedArguments, context) {
--- a/spec/module.commented.js
+++ b/spec/module.commented.js
@ -291,7 +291,7 @@ $.fn.example = function(parameters) {
        // Invoke is used to match internal functions to string lookups.
        // `$('.foo').example('invoke', 'set text', 'Foo')`
        // Method lookups are lazy, looking for many variations of a search string
-        // For example 'set active', will look for both `setText : function(){}`, `set: { text: function(){} }`
+        // For example 'set text', will look for both `setText : function(){}`, `set: { text: function(){} }`
        // Invoke attempts to preserve the 'this' chaining unless a value is returned.
        // If multiple values are returned an array of values matching up to the length of the selector is returned
        invoke: function(query, passedArguments, context) {