🐛 Add hasparent restriction

Androz2091 · Apr 18, 2020 · 2e94959 · 2e94959
1 parent 808a971
commit 2e94959
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/blocks/discord/channels/send_wait_reply_value.js b/src/blocks/discord/channels/send_wait_reply_value.js
@@ -24,7 +24,7 @@ Blockly.JavaScript[blockName] = function(){
 
 registerRestrictions(blockName, [
     {
-        type: "parent",
+        type: "hasparent",
         message: "RES_SEND_WAIT_REPLY_VALUE_PARENT",
         types: [
             "s4d_send_wait_reply"

diff --git a/src/restrictions.js b/src/restrictions.js
@@ -68,6 +68,8 @@ function validateRestriction(block, blocks, restriction) {
             return (blocks.filter(b => restriction.types.includes(b.type) && !b.disabled).length > 0) !== reverse;
         case "parent":
             return (restriction.types.includes(block.getParent().type)) !== reverse;
+        case "hasparent":
+            return (hasParentOfType(block, restriction.types)) !== reverse;
         case "notempty":
             for (let type of restriction.types){
                 try {
@@ -93,14 +95,26 @@ function validateConfiguration(block, restriction) {
         case "parent":
         case "!parent":
             return block.getParent() && !block.getParent().disabled;
+        case "hasparent":
         case "custom":
         case "notempty":
             return true;
         default:
             return false;
     }
 }
-
+
+function hasParentOfType(block, types){
+    let hasParent = false;
+    while(block.getParent()){
+        if(types.includes(block.getParent().type)){
+            hasParent = true;
+        }
+        block = block.getParent();
+    }
+    return hasParent;
+}
+
 function getTopLevelParent(block) {
     if (!block) return null;
     if (!block.getParent()) return block;