Add option to delete all blocks on workspace.

patientslikeme · Dec 3, 2015 · fa279b9 · fa279b9
1 parent 97e5e12
commit fa279b9
Show file tree

Hide file tree

Showing 147 changed files with 194 additions and 99 deletions.
diff --git a/blockly_compressed.js b/blockly_compressed.js
diff --git a/core/block_svg.js b/core/block_svg.js
@@ -547,7 +547,7 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
   }
   // Save the current block in a variable for use in closures.
   var block = this;
-  var options = [];
+  var menuOptions = [];
 
   if (this.isDeletable() && this.isMovable() && !block.isInFlyout) {
     // Option to duplicate this block.
@@ -561,7 +561,7 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
     if (this.getDescendants().length > this.workspace.remainingCapacity()) {
       duplicateOption.enabled = false;
     }
-    options.push(duplicateOption);
+    menuOptions.push(duplicateOption);
 
     if (this.isEditable() && !this.collapsed_ &&
         this.workspace.options.comments) {
@@ -578,7 +578,7 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
           block.setCommentText('');
         };
       }
-      options.push(commentOption);
+      menuOptions.push(commentOption);
     }
 
     // Option to make block inline.
@@ -595,7 +595,7 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
           inlineOption.callback = function() {
             block.setInputsInline(!isInline);
           };
-          options.push(inlineOption);
+          menuOptions.push(inlineOption);
           break;
         }
       }
@@ -609,14 +609,14 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
         expandOption.callback = function() {
           block.setCollapsed(false);
         };
-        options.push(expandOption);
+        menuOptions.push(expandOption);
       } else {
         var collapseOption = {enabled: true};
         collapseOption.text = Blockly.Msg.COLLAPSE_BLOCK;
         collapseOption.callback = function() {
           block.setCollapsed(true);
         };
-        options.push(collapseOption);
+        menuOptions.push(collapseOption);
       }
     }
 
@@ -630,7 +630,7 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
           block.setDisabled(!block.disabled);
         }
       };
-      options.push(disableOption);
+      menuOptions.push(disableOption);
     }
 
     // Option to delete this block.
@@ -649,7 +649,7 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
         block.dispose(true, true);
       }
     };
-    options.push(deleteOption);
+    menuOptions.push(deleteOption);
   }
 
   // Option to get help.
@@ -659,14 +659,14 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
   helpOption.callback = function() {
     block.showHelp_();
   };
-  options.push(helpOption);
+  menuOptions.push(helpOption);
 
-  // Allow the block to add or modify options.
+  // Allow the block to add or modify menuOptions.
   if (this.customContextMenu && !block.isInFlyout) {
-    this.customContextMenu(options);
+    this.customContextMenu(menuOptions);
   }
 
-  Blockly.ContextMenu.show(e, options, this.RTL);
+  Blockly.ContextMenu.show(e, menuOptions, this.RTL);
   Blockly.ContextMenu.currentBlock = this;
 };
 

diff --git a/core/workspace_svg.js b/core/workspace_svg.js
@@ -703,7 +703,7 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
   menuOptions.push(cleanOption);
 
   // Add a little animation to collapsing and expanding.
-  var COLLAPSE_DELAY = 10;
+  var DELAY = 10;
   if (this.options.collapse) {
     var hasCollapsedBlocks = false;
     var hasExpandedBlocks = false;
@@ -731,7 +731,7 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
         while (block) {
           setTimeout(block.setCollapsed.bind(block, shouldCollapse), ms);
           block = block.getNextBlock();
-          ms += COLLAPSE_DELAY;
+          ms += DELAY;
         }
       }
     };
@@ -753,6 +753,47 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
     menuOptions.push(expandOption);
   }
 
+  // Option to delete all blocks.
+  // Count the number of blocks that are deletable.
+  var deleteList = [];
+  function addDeletableBlocks(block) {
+    if (block.isDeletable()) {
+      deleteList = deleteList.concat(block.getDescendants());
+    } else {
+      var children = block.getChildren();
+      for (var i = 0; i < children.length; i++) {
+        addDeletableBlocks(children[i]);
+      }
+    }
+  }
+  for (var i = 0; i < topBlocks.length; i++) {
+    addDeletableBlocks(topBlocks[i]);
+  }
+  var deleteOption = {
+    text: deleteList.length <= 1 ? Blockly.Msg.DELETE_BLOCK :
+        Blockly.Msg.DELETE_X_BLOCKS.replace('%1', String(deleteList.length)),
+    enabled: deleteList.length > 0,
+    callback: function() {
+      if (deleteList.length < 2 ||
+          window.confirm(Blockly.Msg.DELETE_ALL_BLOCKS.replace('%1',
+          String(deleteList.length)))) {
+        deleteNext();
+      }
+    }
+  };
+  function deleteNext() {
+    var block = deleteList.shift();
+    if (block) {
+      if (block.workspace) {
+        block.dispose(false, true);
+        setTimeout(deleteNext, DELAY);
+      } else {
+        deleteNext();
+      }
+    }
+  }
+  menuOptions.push(deleteOption);
+
   Blockly.ContextMenu.show(e, menuOptions, this.RTL);
 };
 

diff --git a/demos/code/code.js b/demos/code/code.js
@@ -515,7 +515,7 @@ Code.runJS = function() {
 Code.discard = function() {
   var count = Code.workspace.getAllBlocks().length;
   if (count < 2 ||
-      window.confirm(MSG['discard'].replace('%1', count))) {
+      window.confirm(Blockly.Msg.DELETE_ALL_BLOCKS.replace('%1', count))) {
     Code.workspace.clear();
     window.location.hash = '';
   }

diff --git a/demos/code/msg/ar.js b/demos/code/msg/ar.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "شغل البرنامج المعرف بواسطة البلوكات في مساحة العمل.",
   badCode: "خطأ في البرنامج:\n %1",
   timeout: "تم تجاوز الحد الأقصى لتكرارات التنفيذ .",
-  discard: "حذف كل بلوكات %1؟",
   trashTooltip: "تجاهل كل البلوكات.",
   catLogic: "منطق",
   catLoops: "الحلقات",

diff --git a/demos/code/msg/be-tarask.js b/demos/code/msg/be-tarask.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Запусьціце праграму, вызначаную блёкамі ў працоўнай вобласьці.",
   badCode: "Памылка праграмы:\n%1",
   timeout: "Перавышана максымальная колькасьць ітэрацыяў.",
-  discard: "Выдаліць усе блёкі %1?",
   trashTooltip: "Выдаліць усе блёкі.",
   catLogic: "Лёгіка",
   catLoops: "Петлі",

diff --git a/demos/code/msg/br.js b/demos/code/msg/br.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Lañsañ ar programm termenet gant ar bloc'hadoù en takad labour.",
   badCode: "Fazi programm :\n%1",
   timeout: "Tizhet eo bet an niver brasañ a iteradurioù seveniñ aotreet.",
-  discard: "Diverkañ an holl vloc'hoù %1 ?",
   trashTooltip: "Disteurel an holl vloc'hoù.",
   catLogic: "Poell",
   catLoops: "Boukloù",

diff --git a/demos/code/msg/ca.js b/demos/code/msg/ca.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Executa el programa definit pels blocs de l'àrea de treball.",
   badCode: "Error de programa:\n %1",
   timeout: "S'ha superat el nombre màxim d'iteracions d'execució.",
-  discard: "Esborrar els %1 blocs?",
   trashTooltip: "Descarta tots els blocs.",
   catLogic: "Lògica",
   catLoops: "Bucles",

diff --git a/demos/code/msg/cs.js b/demos/code/msg/cs.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "",
   badCode: "Chyba programu:\n%1",
   timeout: "Maximum execution iterations exceeded.",
-  discard: "Odstranit všechny bloky %1?",
   trashTooltip: "Zahodit všechny bloky.",
   catLogic: "Logika",
   catLoops: "Smyčky",

diff --git a/demos/code/msg/da.js b/demos/code/msg/da.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Kør programmet, der er defineret af blokkene i arbejdsområdet.",
   badCode: "Programfejl:\n%1",
   timeout: "Maksimale antal udførelsesgentagelser overskredet.",
-  discard: "Slet alle %1 blokke?",
   trashTooltip: "Kassér alle blokke.",
   catLogic: "Logik",
   catLoops: "Løkker",

diff --git a/demos/code/msg/de.js b/demos/code/msg/de.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Das Programm ausführen, das von den Bausteinen im Arbeitsbereich definiert ist.",
   badCode: "Programmfehler:\n%1",
   timeout: "Die maximalen Ausführungswiederholungen wurden überschritten.",
-  discard: "Alle %1 Bausteine löschen?",
   trashTooltip: "Alle Bausteine verwerfen.",
   catLogic: "Logik",
   catLoops: "Schleifen",

diff --git a/demos/code/msg/el.js b/demos/code/msg/el.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Εκτελεί το πρόγραμμα που ορίζεται από τα μπλοκ στον χώρο εργασίας.",
   badCode: "Σφάλμα προγράμματος:\n%1",
   timeout: "Υπέρβαση μέγιστου αριθμού επαναλήψεων.",
-  discard: "Να διαγραφούν και τα %1 μπλοκ?",
   trashTooltip: "Απόρριψη όλων των μπλοκ.",
   catLogic: "Λογική",
   catLoops: "Επαναλήψεις",

diff --git a/demos/code/msg/en.js b/demos/code/msg/en.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Run the program defined by the blocks in the workspace.",
   badCode: "Program error:\n%1",
   timeout: "Maximum execution iterations exceeded.",
-  discard: "Delete all %1 blocks?",
   trashTooltip: "Discard all blocks.",
   catLogic: "Logic",
   catLoops: "Loops",

diff --git a/demos/code/msg/es.js b/demos/code/msg/es.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Ejecute el programa definido por los bloques en el área de trabajo.",
   badCode: "Error del programa:\n%1",
   timeout: "Se excedio el máximo de iteraciones ejecutadas permitidas.",
-  discard: "¿Eliminar todos los bloques %1?",
   trashTooltip: "Descartar todos los bloques.",
   catLogic: "Lógica",
   catLoops: "Secuencias",

diff --git a/demos/code/msg/fa.js b/demos/code/msg/fa.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "اجرای برنامهٔ تعریف‌شده توسط بلوک‌ها در فضای کار.",
   badCode: "خطای برنامه:\n%1",
   timeout: "حداکثر تکرارهای اجرا رد شده‌است.",
-  discard: "حذف همهٔ بلاک‌های %1؟",
   trashTooltip: "دورریختن همهٔ بلوک‌ها.",
   catLogic: "منطق",
   catLoops: "حلقه‌ها",

diff --git a/demos/code/msg/fr.js b/demos/code/msg/fr.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Lancer le programme défini par les blocs dans l’espace de travail.",
   badCode: "Erreur du programme :\n%1",
   timeout: "Nombre maximum d’itérations d’exécution dépassé.",
-  discard: "Supprimer tous les %1 blocs ?",
   trashTooltip: "Jeter tous les blocs.",
   catLogic: "Logique",
   catLoops: "Boucles",

diff --git a/demos/code/msg/he.js b/demos/code/msg/he.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "הרצת התכנית שהוגדרה על ידי קטעי הקוד שבמרחב העבודה.",
   badCode: "שגיאה בתכנית: %1",
   timeout: "חריגה ממספר פעולות חוזרות אפשריות.",
-  discard: "האם למחוק את כל %1 קטעי הקוד?",
   trashTooltip: "השלך את כל קטעי הקוד.",
   catLogic: "לוגיקה",
   catLoops: "לולאות",

diff --git a/demos/code/msg/hrx.js b/demos/code/msg/hrx.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Das Programm ausfüahre, das von den Bausten im Oorweitsbereich definiert ist.",
   badCode: "Programmfehler:\n%1",
   timeout: "Die maximale Ausführungswiederholunge woore üwerschritt.",
-  discard: "All %1 Bausten lösche?",
   trashTooltip: "All Bausten verwerfe.",
   catLogic: "Logik",
   catLoops: "Schleife",

diff --git a/demos/code/msg/hu.js b/demos/code/msg/hu.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Program futtatása.",
   badCode: "Program hiba:\n%1",
   timeout: "A program elérte a maximális végrehajtási időt.",
-  discard: "Az összes %1 blokk törlése?",
   trashTooltip: "Összes blokk törlése.",
   catLogic: "Logikai műveletek",
   catLoops: "Ciklusok",

diff --git a/demos/code/msg/ia.js b/demos/code/msg/ia.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Executar le programma definite per le blocos in le spatio de travalio.",
   badCode: "Error del programma:\n%1",
   timeout: "Le numero de iterationes executate ha excedite le maximo.",
-  discard: "Deler tote le %1 blocos?",
   trashTooltip: "Abandonar tote le blocos.",
   catLogic: "Logica",
   catLoops: "Buclas",

diff --git a/demos/code/msg/is.js b/demos/code/msg/is.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Keyra forritið sem kubbarnir á vinnusvæðinu mynda.",
   badCode: "Villa í forriti:\n%1",
   timeout: "Forritið hefur endurtekið sig of oft.",
-  discard: "Eyða öllum %1 kubbunum?",
   trashTooltip: "Fleygja öllum kubbum.",
   catLogic: "Rökvísi",
   catLoops: "Lykkjur",

diff --git a/demos/code/msg/it.js b/demos/code/msg/it.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Esegui il programma definito dai blocchi nell'area di lavoro.",
   badCode: "Errore programma:\n%1",
   timeout: "È stato superato il numero massimo consentito di interazioni eseguite.",
-  discard: "Cancellare tutti i %1 blocchi?",
   trashTooltip: "Elimina tutti i blocchi.",
   catLogic: "Logica",
   catLoops: "Cicli",

diff --git a/demos/code/msg/ja.js b/demos/code/msg/ja.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "ブロックで作成したプログラムを実行します。",
   badCode: "プログラムのエラー:\n%1",
   timeout: "命令の実行回数が制限値を超えました。",
-  discard: "%1 個すべてのブロックを消しますか?",
   trashTooltip: "すべてのブロックを消します。",
   catLogic: "論理",
   catLoops: "繰り返し",

diff --git a/demos/code/msg/ko.js b/demos/code/msg/ko.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "작업 공간에서 블록으로 정의된 프로그램을 실행합니다.",
   badCode: "프로그램 오류:\n%1",
   timeout: "최대 실행 반복을 초과했습니다.",
-  discard: "모든 블록 %1개를 삭제하겠습니까?",
   trashTooltip: "모든 블록을 버립니다.",
   catLogic: "논리",
   catLoops: "반복",

diff --git a/demos/code/msg/mk.js b/demos/code/msg/mk.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Пушти го програмот определен од блокчињата во работниот простор.",
   badCode: "Грешка во програмот:\n%1",
   timeout: "Го надминавте допуштениот број на повторувања во извршувањето.",
-  discard: "Да ги избришам сите %1 блокчиња?",
   trashTooltip: "Отстрани ги сите блокчиња.",
   catLogic: "Логика",
   catLoops: "Јамки",

diff --git a/demos/code/msg/ms.js b/demos/code/msg/ms.js
@@ -5,8 +5,7 @@ var MSG = {
   runTooltip: "Jalankan aturcara yang ditetapkan oleh blok-blok di dalam ruang kerja.",
   badCode: "Ralat atur cara:\n%1",
   timeout: "Takat maksimum lelaran pelaksanaan dicecah.",
-  discard: "Hapuskan kesemua %1 blok?",
-  trashTooltip: "Buang semua blok.",
+  trashTooltip: "Buang semua Blok.",
   catLogic: "Logik",
   catLoops: "Gelung",
   catMath: "Matematik",

diff --git a/demos/code/msg/nb.js b/demos/code/msg/nb.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Kjør programmet definert av blokken i arbeidsområdet.",
   badCode: "Programfeil:\n%1",
   timeout: "Det maksimale antallet utførte looper er oversteget.",
-  discard: "Slett alle %1 blokker?",
   trashTooltip: "Fjern alle blokker",
   catLogic: "Logikk",
   catLoops: "Looper",

diff --git a/demos/code/msg/nl.js b/demos/code/msg/nl.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Voer het programma uit dat met de blokken in de werkruimte is gemaakt.",
   badCode: "Programmafout:\n%1",
   timeout: "Het maximale aantal iteraties is overschreden.",
-  discard: "Alle %1 blokken verwijderen?",
   trashTooltip: "Alle blokken verwijderen",
   catLogic: "Logica",
   catLoops: "Lussen",

diff --git a/demos/code/msg/oc.js b/demos/code/msg/oc.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Aviar lo programa definit pels blòts dins l’espaci de trabalh.",
   badCode: "Error del programa :\n%1",
   timeout: "Nombre maximum d’iteracions d’execucion depassat.",
-  discard: "Suprimir totes los %1 blòts ?",
   trashTooltip: "Getar totes los blòts.",
   catLogic: "Logic",
   catLoops: "Boclas",

diff --git a/demos/code/msg/pl.js b/demos/code/msg/pl.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Uruchom program zdefinowany przez bloki w obszarze roboczym",
   badCode: "Błąd programu:\n%1",
   timeout: "Maksymalna liczba iteracji wykonywań przekroczona",
-  discard: "Usunąć wszystkie %1 bloki?",
   trashTooltip: "Odrzuć wszystkie bloki.",
   catLogic: "Logika",
   catLoops: "Pętle",

diff --git a/demos/code/msg/pms.js b/demos/code/msg/pms.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Fé andé ël programa definì dai blòch ant lë spassi ëd travaj.",
   badCode: "Eror dël programa:\n%1",
   timeout: "Nùmer màssim d'arpetission d'esecussion sorpassà.",
-  discard: "Scancelé tuti ij %1 blòch?",
   trashTooltip: "Scarté tuti ij blòch.",
   catLogic: "Lògica",
   catLoops: "Liasse",

diff --git a/demos/code/msg/pt-br.js b/demos/code/msg/pt-br.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Execute o programa definido pelos blocos na área de trabalho.",
   badCode: "Erro no programa:\n%1",
   timeout: "Máximo de iterações de execução excedido.",
-  discard: "Apagar todos os %1 blocos?",
   trashTooltip: "Descartar todos os blocos.",
   catLogic: "Lógica",
   catLoops: "Laços",

diff --git a/demos/code/msg/ro.js b/demos/code/msg/ro.js
@@ -5,7 +5,6 @@ var MSG = {
   runTooltip: "Execută programul definit de către blocuri în spațiul de lucru.",
   badCode: "Eroare de program:\n%1",
   timeout: "Numărul maxim de iterații a fost depășit.",
-  discard: "Ștergi toate cele %1 (de) blocuri?",
   trashTooltip: "Șterge toate blocurile.",
   catLogic: "Logic",
   catLoops: "Bucle",