From f7a182ec2ff03b86ca2d373790bfd71c34b88506 Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Tue, 7 Jan 2014 14:07:08 +0200 Subject: [PATCH 1/4] Added missing opening HTML tag --- server/layouts/default.html.eco | 1 + 1 file changed, 1 insertion(+) diff --git a/server/layouts/default.html.eco b/server/layouts/default.html.eco index 1314bd751..201d35221 100755 --- a/server/layouts/default.html.eco +++ b/server/layouts/default.html.eco @@ -1,4 +1,5 @@ + <% uiIntroduction = @getCollection("documents").findAll({type: $in: ['UI Introduction']},[{title: 1}]).toJSON() %> <% uiProject = @getCollection("documents").findAll({type: $in: ['Semantic Project']},[{title: 1}]).toJSON() %> From 634b87f81d610749dea2f4510ffe90ba8ebbbfcb Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Tue, 7 Jan 2014 14:43:03 +0200 Subject: [PATCH 2/4] Update description for onApprove callback --- server/documents/modules/modal.html.eco | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/documents/modules/modal.html.eco b/server/documents/modules/modal.html.eco index ab769d3e6..ff15360c7 100755 --- a/server/documents/modules/modal.html.eco +++ b/server/documents/modules/modal.html.eco @@ -450,7 +450,7 @@ type : 'UI Module' onApprove Modal - Is called after a positive or approve button is pressed + Is called after a positive or approve or ok button is pressed onDeny From f085f8c1fc305fcd02dc0717686a4b72594b7edd Mon Sep 17 00:00:00 2001 From: Mohammad Younes Date: Tue, 7 Jan 2014 16:46:46 +0200 Subject: [PATCH 3/4] comma instead of "or" --- server/documents/modules/modal.html.eco | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/documents/modules/modal.html.eco b/server/documents/modules/modal.html.eco index ff15360c7..737d4bef5 100755 --- a/server/documents/modules/modal.html.eco +++ b/server/documents/modules/modal.html.eco @@ -168,7 +168,7 @@ type : 'UI Module'

Approve / Deny Callbacks

-

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

+

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

$('.basic.modal') .modal('setting', { @@ -450,12 +450,12 @@ type : 'UI Module' onApprove Modal - Is called after a positive or approve or ok button is pressed + Is called after a positive, approve or ok button is pressed onDeny Modal - Is called after a negative or deny or cancel button is pressed. + Is called after a negative, deny or cancel button is pressed. From 5df164eec66bf9b9cd6cfbd7bd84a5a06bf344f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Gon=C3=A7alves?= Date: Tue, 7 Jan 2014 16:52:23 +0000 Subject: [PATCH 4/4] Fixing typos --- spec/modal.commented.js | 2 +- spec/module.commented.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/modal.commented.js b/spec/modal.commented.js index bebbc8f03..676f05dab 100755 --- 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) { diff --git a/spec/module.commented.js b/spec/module.commented.js index 90a2517a3..93b4e2e7d 100755 --- 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) {