Xregexp install natives

LaserWeb · Jun 29, 2018 · 22e0f7e · 22e0f7e
1 parent 17e6f53
commit 22e0f7e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/lib/action2gcode/generators/abstract-generator.js b/src/lib/action2gcode/generators/abstract-generator.js
@@ -1,5 +1,5 @@
-import XRegExp from 'XRegExp'
-XRegExp.install('natives')
+import XRegExp from 'xregexp';
+
 // AbstractDriver class
 class AbstractGenerator {
   // Class constructor...
@@ -9,7 +9,10 @@ class AbstractGenerator {
 
   postProcessRaster(gcode){
     if (this.settings.gcodeToolOn && this.settings.gcodeToolOff){
-      return gcode.replace(new XRegExp("G0(.*?)G1","gis"),'G0$1\n'+this.settings.gcodeToolOn+'\nG1').replace(new XRegExp("G1(.*?)G0","gis"),'G1$1\n'+this.settings.gcodeToolOff+'\nG0')
+      gcode = XRegExp.replace(gcode,new XRegExp("G0(.*?)G1","gis"),'G0$1\n'+this.settings.gcodeToolOn+'\nG1')
+      gcode = XRegExp.replace(gcode,new XRegExp("G1(.*?)G0","gis"),'G1$1\n'+this.settings.gcodeToolOff+'\nG0')
+      return gcode;
+      //return gcode.replace(new XRegExp("G0(.*?)G1","gis"),'G0$1\n'+this.settings.gcodeToolOn+'\nG1').replace(new XRegExp("G1(.*?)G0","gis"),'G1$1\n'+this.settings.gcodeToolOff+'\nG0')
     }
     return gcode;
   }