From bbaf7bf247b69c2d1371518ff9e68735d87295b2 Mon Sep 17 00:00:00 2001
From: Dave C-J <conway@uk.ibm.com>
Date: Mon, 27 Oct 2014 08:54:05 +0000
Subject: [PATCH 1/2] correcting typos in trigger node... oops

---
 nodes/core/core/89-trigger.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nodes/core/core/89-trigger.js b/nodes/core/core/89-trigger.js
index d86a21309..94c365415 100644
--- a/nodes/core/core/89-trigger.js
+++ b/nodes/core/core/89-trigger.js
@@ -37,11 +37,11 @@ module.exports = function(RED) {
         if (!isNaN(this.op1)) { this.op1 = Number(this.op1); }
         if (!isNaN(this.op2)) { this.op2 = Number(this.op2); }
         if (this.op1 == "true") { this.op1 = true; }
-        if (this.op2 == "true") { this.op1 = true; }
-        if (this.op1 == "false") { this.op2 = false; }
+        if (this.op2 == "true") { this.op2 = true; }
+        if (this.op1 == "false") { this.op1 = false; }
         if (this.op2 == "false") { this.op2 = false; }
         if (this.op1 == "null") { this.op1 = null; }
-        if (this.op2 == "null") { this.op1 = null; }
+        if (this.op2 == "null") { this.op2 = null; }
         try { this.op1 = JSON.parse(this.op1); }
         catch(e) { this.op1 = this.op1; }
         try { this.op2 = JSON.parse(this.op2); }

From c51866c2c5bb5e421ea7991e0129e3d4fcc08cda Mon Sep 17 00:00:00 2001
From: Dave C-J <conway@uk.ibm.com>
Date: Mon, 27 Oct 2014 15:07:34 +0000
Subject: [PATCH 2/2] =?UTF-8?q?Add=20=E2=8C=98=20Cmd=20key=20as=20alternat?=
 =?UTF-8?q?ive=20to=20Ctrl=20key=20to=20make=20Mac=20users=20happy.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html         | 3 +++
 public/red/ui/keyboard.js | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 8141b8a1a..f8f6e0d4d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -136,6 +136,9 @@
           <td><span class="help-key">Ctrl</span> <span class="help-key">+</span></td><td>Zoom in</td>
           <td><span class="help-key">Ctrl</span> <span class="help-key">-</span></td><td>Zoom out</td>
         </tr>
+        <tr>
+          <td colspan="4">Mac users can use the <b>⌘ - Cmd</b> key rather than Ctrl key.</td>
+        </tr>
     </table>
   </div>
   <div class="modal-footer">
diff --git a/public/red/ui/keyboard.js b/public/red/ui/keyboard.js
index 3bc28c4d6..e1fc14161 100644
--- a/public/red/ui/keyboard.js
+++ b/public/red/ui/keyboard.js
@@ -24,19 +24,20 @@ RED.keyboard = (function() {
         if (handler && handler.ondown) {
             if (!handler.modifiers ||
                 ((!handler.modifiers.shift || d3.event.shiftKey) &&
-                 (!handler.modifiers.ctrl  || d3.event.ctrlKey ) &&
+                 (!handler.modifiers.ctrl  || !handler.modifiers.meta || d3.event.ctrlKey || d3.event.metaKey) &&
                  (!handler.modifiers.alt   || d3.event.altKey  ) )) {
                 handler.ondown();
             }
         }
     });
+
     d3.select(window).on("keyup",function() {
         if (!active) { return; }
         var handler = handlers[d3.event.keyCode];
         if (handler && handler.onup) {
             if (!handler.modifiers ||
                 ((!handler.modifiers.shift || d3.event.shiftKey) &&
-                 (!handler.modifiers.ctrl  || d3.event.ctrlKey ) &&
+                 (!handler.modifiers.ctrl  || !handler.modifiers.meta || d3.event.ctrlKey || d3.event.metaKey) &&
                  (!handler.modifiers.alt   || d3.event.altKey  ) )) {
                 handler.onup();
             }
@@ -46,7 +47,6 @@ RED.keyboard = (function() {
         var mod = modifiers;
         var cbdown = ondown;
         var cbup = onup;
-
         if (typeof modifiers == "function") {
             mod = {};
             cbdown = modifiers;