Merge remote-tracking branch 'origin/location' into development

1 files changed, 19 insertions, 0 deletions

diff --git a/blocks.js b/blocks.js
index e6bceeb..4f7f0eb 100644
--- a/blocks.js
+++ b/blocks.js
@@ -866,6 +866,25 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
             );
             part.setContents(['date']);
             break;
+        case '%locations':
+            part = new InputSlotMorph(
+                null, // text
+                false, // non-numeric
+                {
+                    'all' : ['all'],
+                    'country' : ['country'],
+                    'state' : ['state'],
+                    'state district' : ['state district'],
+                    'suburb' : ['suburb'],
+                    'city' : ['city'],
+                    'road' : ['road'],
+                    'house number' : ['house number'],
+                    'licence': ['licence']
+                },
+                true // read-only
+            );
+            part.setContents(['all']);
+            break;
         case '%delim':
             part = new InputSlotMorph(
                 null, // text