Automatically built.

commit 5c7c16d
Merge: 09ee611 a4393ed
Author: Chris Pirich <chris@code.org>
Date:   Mon Mar 9 14:34:09 2015 -0700

    Merge pull request code-dot-org#1527 from code-dot-org/droplet_update_modeOptions

    update droplet, modify modeOptions to handle new format with colors

commit 09ee611
Merge: 51a2d1f f5230b5
Author: Laurel Fan <laurel@code.org>
Date:   Mon Mar 9 14:32:09 2015 -0700

    Merge branch 'email-validation' into staging

Author: deploy-code-org

dashboard/public/apps-package/css/common.css

@@ -57,16 +57,22 @@ div.droplet-palette-group-header-selected {
   color: #000; }
 
 .droplet-palette-group-header.yellow {
-  border-left: 10px solid #e0e053; }
+  border-left: 10px solid #ffd54f; }
 
 .droplet-palette-group-header-selected.yellow {
-  background-color: #e0e053; }
+  background-color: #ffd54f; }
 
 .droplet-palette-group-header.red {
-  border-left: 10px solid #FA8A8C; }
+  border-left: 10px solid #f87477; }
 
 .droplet-palette-group-header-selected.red {
-  background-color: #FA8A8C; }
+  background-color: #f87477; }
+
+.droplet-palette-group-header.cyan {
+  border-left: 10px solid #00d2e2; }
+
+.droplet-palette-group-header-selected.cyan {
+  background-color: #00d2e2; }
 
 .droplet-wrapper-div {
   overflow: hidden;

dashboard/public/apps-package/js/applab.js

@@ -2917,19 +2917,19 @@ module.exports.blocks = [
 
 module.exports.categories = {
   'UI controls': {
-    'color': 'red',
+    'color': 'yellow',
     'blocks': []
   },
   'Canvas': {
-    'color': 'yellow',
+    'color': 'red',
     'blocks': []
   },
   'Data': {
     'color': 'orange',
     'blocks': []
   },
   'Turtle': {
-    'color': 'yellow',
+    'color': 'cyan',
     'blocks': []
   },
   'Advanced': {

dashboard/public/apps-package/js/applab.min.js

@@ -10451,17 +10451,26 @@ exports.generateAceApiCompleter = function (dropletConfig) {
   };
 };
 
-function populateModeOptionsFromConfigBlocks(modeOptions, configBlocks) {
-  for (var i = 0; i < configBlocks.length; i++) {
-    if (configBlocks[i].type === 'value') {
-      modeOptions.valueFunctions.push(configBlocks[i].func);
+function populateModeOptionsFromConfigBlocks(modeOptions, config) {
+  var mergedCategories = mergeCategoriesWithConfig(config);
+
+  for (var i = 0; i < config.blocks.length; i++) {
+    var newFunc = {};
+
+    if (config.blocks[i].type === 'value') {
+      newFunc.value = true;
     }
-    else if (configBlocks[i].type === 'either') {
-      modeOptions.eitherFunctions.push(configBlocks[i].func);
+    else if (config.blocks[i].type === 'either') {
+      newFunc.value = true;
+      newFunc.command = true;
     }
-    else if (configBlocks[i].type !== 'hidden') {
-      modeOptions.blockFunctions.push(configBlocks[i].func);
+
+    var category = mergedCategories[config.blocks[i].category];
+    if (category) {
+      newFunc.color = category.rgb || category.color;
     }
+
+    modeOptions.functions[config.blocks[i].func] = newFunc;
   }
 }
 
@@ -10470,23 +10479,12 @@ function populateModeOptionsFromConfigBlocks(modeOptions, configBlocks) {
  */
 exports.generateDropletModeOptions = function (dropletConfig) {
   var modeOptions = {
-    blockFunctions: [],
-    valueFunctions: [],
-    eitherFunctions: [],
+    functions: []
   };
 
-  // BLOCK, VALUE, and EITHER functions that are normally used in droplet
-  // are included here in comments for reference. When we return our own
-  // modeOptions from this function, it overrides and replaces the list below.
-/*
-  BLOCK_FUNCTIONS = ['fd', 'bk', 'rt', 'lt', 'slide', 'movexy', 'moveto', 'jump', 'jumpto', 'turnto', 'home', 'pen', 'fill', 'dot', 'box', 'mirror', 'twist', 'scale', 'pause', 'st', 'ht', 'cs', 'cg', 'ct', 'pu', 'pd', 'pe', 'pf', 'play', 'tone', 'silence', 'speed', 'wear', 'write', 'drawon', 'label', 'reload', 'see', 'sync', 'send', 'recv', 'click', 'mousemove', 'mouseup', 'mousedown', 'keyup', 'keydown', 'keypress', 'alert'];
-  VALUE_FUNCTIONS = ['abs', 'acos', 'asin', 'atan', 'atan2', 'cos', 'sin', 'tan', 'ceil', 'floor', 'round', 'exp', 'ln', 'log10', 'pow', 'sqrt', 'max', 'min', 'random', 'pagexy', 'getxy', 'direction', 'distance', 'shown', 'hidden', 'inside', 'touches', 'within', 'notwithin', 'nearest', 'pressed', 'canvas', 'hsl', 'hsla', 'rgb', 'rgba', 'cell'];
-  EITHER_FUNCTIONS = ['button', 'read', 'readstr', 'readnum', 'table', 'append', 'finish', 'loadscript'];
-*/
-
-  populateModeOptionsFromConfigBlocks(modeOptions, exports.dropletGlobalConfigBlocks);
-  populateModeOptionsFromConfigBlocks(modeOptions, exports.dropletBuiltinConfigBlocks);
-  populateModeOptionsFromConfigBlocks(modeOptions, dropletConfig.blocks);
+  populateModeOptionsFromConfigBlocks(modeOptions, { blocks: exports.dropletGlobalConfigBlocks });
+  populateModeOptionsFromConfigBlocks(modeOptions, { blocks: exports.dropletBuiltinConfigBlocks });
+  populateModeOptionsFromConfigBlocks(modeOptions, dropletConfig);
 
   return modeOptions;
 };