Merge branch 'master' of github.com:walterbender/turtleblocksjs

Author: Walter Bender

js/analytics.js

@@ -25,7 +25,7 @@ const TACAT = {
     'gray': 'pen', 'fillscreen': 'pen', 'beginfill': 'fill',
     'fill': 'fill', 'setfont': 'fill', 'hollowline': 'fill',
     'endfill': 'fill', 'plus': 'number', 'minus': 'number',
-    'multiply': 'number', 'divide': 'number', 'oneOf': 'number',
+    'multiply': 'number', 'power': 'number', 'divide': 'number', 'oneOf': 'number',
     'pendown': 'pen', 'shade': 'pen', 'mod': 'number', 'int': 'number',
     'sqrt': 'number', 'identity': 'number', 'and': 'boolean',
     'or': 'boolean', 'not': 'boolean', 'greater': 'boolean',

js/basicblocks.js

@@ -408,6 +408,14 @@ function initBasicProtoBlocks(palettes, blocks) {
     divideBlock.twoArgMathBlock();
     divideBlock.defaults.push(100, 10)
 
+    var powerBlock = new ProtoBlock('power');
+    powerBlock.palette = palettes.dict['number'];
+    blocks.protoBlockDict['power'] = powerBlock;
+    powerBlock.fontsize = 14;
+    powerBlock.staticLabels.push('^');
+    powerBlock.twoArgMathBlock();
+    powerBlock.defaults.push(2,4)
+
     var multiplyBlock = new ProtoBlock('multiply');
     multiplyBlock.palette = palettes.dict['number'];
     blocks.protoBlockDict['multiply'] = multiplyBlock;

js/logo.js

@@ -184,6 +184,7 @@ function Logo(canvas, blocks, turtles, stage, refreshCanvas, textMsg, errorMsg,
             case 'plus':
             case 'minus':
             case 'multiply':
+            case 'power':
             case 'divide':
                 value = this.blocks.blockList[blk].value;
                 break;
@@ -1937,6 +1938,19 @@ function Logo(canvas, blocks, turtles, stage, refreshCanvas, textMsg, errorMsg,
                     logo.blocks.blockList[blk].value = logo.doPlus(a, b);
                 }
                 break;
+            
+            case 'power':
+                if (logo.inStatusMatrix) {
+                    logo.statusFields.push([blk, 'power']);
+                } else {
+                    var cblk1 = logo.blocks.blockList[blk].connections[1];
+                    var cblk2 = logo.blocks.blockList[blk].connections[2];
+                    var a = logo.parseArg(logo, turtle, cblk1, blk, receivedArg);
+                    var b = logo.parseArg(logo, turtle, cblk2, blk, receivedArg);
+                    logo.blocks.blockList[blk].value = logo._doPower(a, b);
+                }
+                break;   
+    
             case 'multiply':
                 if (logo.inStatusMatrix) {
                     logo.statusFields.push([blk, logo.blocks.blockList[blk].name]);
@@ -2434,6 +2448,18 @@ function Logo(canvas, blocks, turtles, stage, refreshCanvas, textMsg, errorMsg,
         }
     }
 
+
+    this._doPower = function(a, b) {
+        if (typeof(a) === 'string' || typeof(b) === 'string') {
+            this.errorMsg(NANERRORMSG);
+            this.stopTurtle = true;
+            return 0;
+        }
+
+        return Math.pow(a,b);
+    }
+    
+
     this.setBackgroundColor = function(turtle) {
         /// Change body background in DOM to current color.
         var body = document.body;

js/status.js

@@ -112,6 +112,7 @@ function StatusMatrix() {
             case 'neg':
             case 'divide':
             case 'multiply':
+            case 'power':
             case 'sqrt':
             case 'int':
             case 'mod':