From d8cf86fd6f200805e588c0730d66c008218786d5 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 10 Jul 2018 11:41:46 +0100
Subject: [PATCH] Add RED.utils.parseContextKey

---
 editor/js/ui/common/typedInput.js | 13 ++++---------
 editor/js/ui/utils.js             | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/editor/js/ui/common/typedInput.js b/editor/js/ui/common/typedInput.js
index 74bbeb9ac..59db274f7 100644
--- a/editor/js/ui/common/typedInput.js
+++ b/editor/js/ui/common/typedInput.js
@@ -15,16 +15,11 @@
  **/
 (function($) {
     var contextParse = function(v) {
-        var parts = {};
-        var m = /^#:\((\S+?)\)::(.*)$/.exec(v);
-        if (m) {
-            parts.option = m[1];
-            parts.value = m[2];
-        } else {
-            parts.value = v;
-            parts.option = RED.settings.context.default;
+        var parts = RED.utils.parseContextKey(v);
+        return {
+            option: parts.store,
+            value: parts.key
         }
-        return parts;
     }
     var contextExport = function(v,opt) {
         if (!opt) {
diff --git a/editor/js/ui/utils.js b/editor/js/ui/utils.js
index e64a33996..7da56ab78 100644
--- a/editor/js/ui/utils.js
+++ b/editor/js/ui/utils.js
@@ -828,6 +828,20 @@ RED.utils = (function() {
         return payload;
     }
 
+    function parseContextKey(key) {
+        var parts = {};
+        var m = /^#:\((\S+?)\)::(.*)$/.exec(key);
+        if (m) {
+            parts.store = m[1];
+            parts.key = m[2];
+        } else {
+            parts.key = key;
+            if (RED.settings.context) {
+                parts.store = RED.settings.context.default;
+            }
+        }
+        return parts;
+    }
 
     return {
         createObjectElement: buildMessageElement,
@@ -839,6 +853,7 @@ RED.utils = (function() {
         getNodeIcon: getNodeIcon,
         getNodeLabel: getNodeLabel,
         addSpinnerOverlay: addSpinnerOverlay,
-        decodeObject: decodeObject
+        decodeObject: decodeObject,
+        parseContextKey: parseContextKey
     }
 })();