Fixed the undo problem caused by the bw compat code

aminmarashi · aminmarashi · commit 0061c9d7f6f7 · 2016-10-19T17:16:08.000+08:00
diff --git a/src/botPage/view/blockly/blocks/trade/index.js b/src/botPage/view/blockly/blocks/trade/index.js
@@ -10,6 +10,7 @@ import { setBlockTextColor, findTopParentBlock, deleteBlockIfExists } from '../.
 
 const backwardCompatibility = (block) => {
   setTimeout(() => {
+    Blockly.Events.recordUndo = false;
     const parent = block.getParent();
     if (parent) {
       const submarketConnection = block.getInput('SUBMARKET').connection;
@@ -21,6 +22,7 @@ const backwardCompatibility = (block) => {
       submarketConnection.connect((ancestor || parent).previousConnection);
     }
     block.setPreviousStatement(false);
+    Blockly.Events.recordUndo = true;
   }, 0);
 };
 
diff --git a/src/botPage/view/blockly/index.js b/src/botPage/view/blockly/index.js
@@ -124,7 +124,9 @@ export default class _Blockly {
     }
   }
   cleanUp() {
+    Blockly.Events.recordUndo = false;
     Blockly.mainWorkspace.cleanUp();
+    Blockly.Events.recordUndo = true;
   }
   xmlToStr(xml) {
     const serializer = new XMLSerializer();
@@ -185,8 +187,10 @@ export default class _Blockly {
     return Blockly.Xml.domToBlock(blockXml, Blockly.mainWorkspace);
   }
   resetWorkspace() {
+    Blockly.Events.recordUndo = false;
     Blockly.mainWorkspace.clear();
     Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(this.blocksXmlStr), Blockly.mainWorkspace);
+    Blockly.Events.recordUndo = true;
   }
   loadWorkspace(xml) {
     Blockly.mainWorkspace.clear();
@@ -224,6 +228,7 @@ export default class _Blockly {
       observer.emit('ui.log.error',
         translator.translateText('Unrecognized file format.'));
     } else {
+      Blockly.Events.recordUndo = false;
       try {
         const xml = Blockly.Xml.textToDom(blockStr);
         if (xml.hasAttribute('collection') && xml.getAttribute('collection') === 'true') {
@@ -241,6 +246,7 @@ export default class _Blockly {
             translator.translateText('Unrecognized file format.'));
         }
       }
+      Blockly.Events.recordUndo = true;
     }
   }
   save(filename, collection) {
diff --git a/src/botPage/view/blockly/relationChecker.js b/src/botPage/view/blockly/relationChecker.js
@@ -124,7 +124,9 @@ export const submarket = (blockObj, ev) => {
       observer.emit('ui.log.warn',
         translator.translateText('Submarket blocks can only accept trade type blocks'));
       for (const child of Array.prototype.slice.apply(blockObj.childBlocks_)) {
-        disable(child);
+        Blockly.Events.recordUndo = false;
+        child.unplug();
+        Blockly.Events.recordUndo = true;
       }
     } else if (blockObj.childBlocks_.length > 0) {
       condition(blockObj.childBlocks_[0], ev, true);
diff --git a/src/botPage/view/blockly/utils.js b/src/botPage/view/blockly/utils.js
@@ -6,21 +6,25 @@ import { translator } from '../../../common/translator';
 const purchaseChoices = [[translator.translateText('Click to select'), '']];
 
 export const deleteBlockIfExists = (block) => {
+  Blockly.Events.recordUndo = false;
   for (const mainBlock of Blockly.mainWorkspace.getTopBlocks()) {
     if (!block.isInFlyout && mainBlock.id !== block.id && mainBlock.type === block.type) {
       block.dispose();
       return true;
     }
   }
+  Blockly.Events.recordUndo = true;
   return false;
 };
 
 export const setBlockTextColor = (block) => {
+  Blockly.Events.recordUndo = false;
   const field = block.getField();
   if (field) {
     field.getSvgRoot()
       .style.setProperty('fill', 'white', 'important');
   }
+  Blockly.Events.recordUndo = true;
 };
 
 export const configMainBlock = (ev, type) => {
@@ -109,6 +113,7 @@ export const addPurchaseOptions = (submarket) => {
     });
     const purchases = Blockly.mainWorkspace.getAllBlocks()
       .filter((r) => (['purchase', 'payout', 'ask_price'].indexOf(r.type) >= 0));
+    Blockly.Events.recordUndo = false;
     for (const purchase of purchases) {
       const value = purchase.getField('PURCHASE_LIST')
         .getValue();
@@ -126,6 +131,7 @@ export const addPurchaseOptions = (submarket) => {
           .setText(firstOption.name);
       }
     }
+    Blockly.Events.recordUndo = true;
   }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,9 @@ export default class _Blockly {`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`cleanUp() {`
	`127`	`+ Blockly.Events.recordUndo = false;`
`127`	`128`	`Blockly.mainWorkspace.cleanUp();`
	`129`	`+ Blockly.Events.recordUndo = true;`
`128`	`130`	`}`
`129`	`131`	`xmlToStr(xml) {`
`130`	`132`	`const serializer = new XMLSerializer();`
`@@ -185,8 +187,10 @@ export default class _Blockly {`
`185`	`187`	`return Blockly.Xml.domToBlock(blockXml, Blockly.mainWorkspace);`
`186`	`188`	`}`
`187`	`189`	`resetWorkspace() {`
	`190`	`+ Blockly.Events.recordUndo = false;`
`188`	`191`	`Blockly.mainWorkspace.clear();`
`189`	`192`	`Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(this.blocksXmlStr), Blockly.mainWorkspace);`
	`193`	`+ Blockly.Events.recordUndo = true;`
`190`	`194`	`}`
`191`	`195`	`loadWorkspace(xml) {`
`192`	`196`	`Blockly.mainWorkspace.clear();`
`@@ -224,6 +228,7 @@ export default class _Blockly {`
`224`	`228`	`observer.emit('ui.log.error',`
`225`	`229`	`translator.translateText('Unrecognized file format.'));`
`226`	`230`	`} else {`
	`231`	`+ Blockly.Events.recordUndo = false;`
`227`	`232`	`try {`
`228`	`233`	`const xml = Blockly.Xml.textToDom(blockStr);`
`229`	`234`	`if (xml.hasAttribute('collection') && xml.getAttribute('collection') === 'true') {`
`@@ -241,6 +246,7 @@ export default class _Blockly {`
`241`	`246`	`translator.translateText('Unrecognized file format.'));`
`242`	`247`	`}`
`243`	`248`	`}`
	`249`	`+ Blockly.Events.recordUndo = true;`
`244`	`250`	`}`
`245`	`251`	`}`
`246`	`252`	`save(filename, collection) {`