Thanish-coder
diff --git a/‎blockly_accessible_compressed.js
Lines changed: 325 additions & 215 deletions b/‎blockly_accessible_compressed.js
Lines changed: 325 additions & 215 deletions
diff --git a/‎blockly_accessible_uncompressed.js
Lines changed: 1532 additions & 1532 deletions b/‎blockly_accessible_uncompressed.js
Lines changed: 1532 additions & 1532 deletions
diff --git a/‎blockly_compressed.js
Lines changed: 430 additions & 321 deletions b/‎blockly_compressed.js
Lines changed: 430 additions & 321 deletions
diff --git a/‎blockly_uncompressed.js
Lines changed: 1501 additions & 1501 deletions b/‎blockly_uncompressed.js
Lines changed: 1501 additions & 1501 deletions
diff --git a/‎blocks_compressed.js
Lines changed: 63 additions & 46 deletions b/‎blocks_compressed.js
Lines changed: 63 additions & 46 deletions
diff --git a/‎build.py
Lines changed: 35 additions & 26 deletions b/‎build.py
Lines changed: 35 additions & 26 deletions
diff --git a/‎core/block.js
Lines changed: 2 additions & 1 deletion b/‎core/block.js
Lines changed: 2 additions & 1 deletion
diff --git a/‎core/block_svg.js
Lines changed: 8 additions & 13 deletions b/‎core/block_svg.js
Lines changed: 8 additions & 13 deletions
diff --git a/‎core/extensions.js
Lines changed: 11 additions & 12 deletions b/‎core/extensions.js
Lines changed: 11 additions & 12 deletions
diff --git a/‎core/field_image.js
Lines changed: 1 addition & 1 deletion b/‎core/field_image.js
Lines changed: 1 addition & 1 deletion
@@ -145,6 +145,7 @@ def run(self):
     base_path = calcdeps.FindClosureBasePath(self.search_paths)
     for dep in calcdeps.BuildDependenciesFromFiles(self.search_paths):
       add_dependency.append(calcdeps.GetDepsLine(dep, base_path))
+    add_dependency.sort()  # Deterministic build.
     add_dependency = '\n'.join(add_dependency)
     # Find the Blockly directory name and replace it with a JS variable.
     # This allows blockly_uncompressed.js to be compiled on one computer and be
@@ -158,7 +159,7 @@ def run(self):
     for dep in calcdeps.BuildDependenciesFromFiles(self.search_paths):
       if not dep.filename.startswith(os.pardir + os.sep):  # '../'
         provides.extend(dep.provides)
-    provides.sort()
+    provides.sort()  # Deterministic build.
     f.write('\n')
     f.write('// Load Blockly.\n')
     for provide in provides:
@@ -229,6 +230,35 @@ def gen_core(self):
     # Read in all the source files.
     filenames = calcdeps.CalculateDependencies(self.search_paths,
         [os.path.join("core", "blockly.js")])
+    filenames.sort()  # Deterministic build.
+    for filename in filenames:
+      # Filter out the Closure files (the compiler will add them).
+      if filename.startswith(os.pardir + os.sep):  # '../'
+        continue
+      f = open(filename)
+      params.append(("js_code", "".join(f.readlines())))
+      f.close()
+
+    self.do_compile(params, target_filename, filenames, "")
+
+  def gen_accessible(self):
+    target_filename = "blockly_accessible_compressed.js"
+    # Define the parameters for the POST request.
+    params = [
+        ("compilation_level", "SIMPLE_OPTIMIZATIONS"),
+        ("use_closure_library", "true"),
+        ("language_out", "ES5"),
+        ("output_format", "json"),
+        ("output_info", "compiled_code"),
+        ("output_info", "warnings"),
+        ("output_info", "errors"),
+        ("output_info", "statistics"),
+      ]
+
+    # Read in all the source files.
+    filenames = calcdeps.CalculateDependencies(self.search_paths,
+        [os.path.join("accessible", "app.component.js")])
+    filenames.sort()  # Deterministic build.
     for filename in filenames:
       # Filter out the Closure files (the compiler will add them).
       if filename.startswith(os.pardir + os.sep):  # '../'
@@ -282,6 +312,7 @@ def gen_blocks(self):
     # Add Blockly.Blocks to be compatible with the compiler.
     params.append(("js_code", "goog.provide('Blockly.Blocks');"))
     filenames = glob.glob(os.path.join("blocks", "*.js"))
+    filenames.sort()  # Deterministic build.
     for filename in filenames:
       f = open(filename)
       params.append(("js_code", "".join(f.readlines())))
@@ -308,6 +339,7 @@ def gen_generator(self, language):
     params.append(("js_code", "goog.provide('Blockly.Generator');"))
     filenames = glob.glob(
         os.path.join("generators", language, "*.js"))
+    filenames.sort()  # Deterministic build.
     filenames.insert(0, os.path.join("generators", language + ".js"))
     for filename in filenames:
       f = open(filename)
@@ -372,31 +404,6 @@ def file_lookup(name):
 
       code = HEADER + "\n" + json_data["compiledCode"]
       code = code.replace(remove, "")
-
-      # Trim down Google's Apache licences.
-      # The Closure Compiler used to preserve these until August 2015.
-      # Delete this in a few months if the licences don't return.
-      LICENSE = re.compile("""/\\*
-
- [\w ]+
-
- (Copyright \\d+ Google Inc.)
- https://developers.google.com/blockly/
-
- Licensed under the Apache License, Version 2.0 \(the "License"\);
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-\\*/""")
-      code = re.sub(LICENSE, r"\n// \1  Apache License 2.0", code)
-
       stats = json_data["statistics"]
       original_b = stats["originalSize"]
       compressed_b = stats["compressedSize"]
@@ -519,8 +526,10 @@ def run(self):
 
   core_search_paths = calcdeps.ExpandDirectories(
       ["core", os.path.join(os.path.pardir, "closure-library")])
+  core_search_paths.sort()  # Deterministic build.
   full_search_paths = calcdeps.ExpandDirectories(
       ["accessible", "core", os.path.join(os.path.pardir, "closure-library")])
+  full_search_paths.sort()  # Deterministic build.
 
   if (len(sys.argv) == 1):
     args = ['core', 'accessible', 'generators', 'defaultlangfiles']
 
@@ -1245,7 +1245,8 @@ Blockly.Block.newFieldTextInputFromJson_ = function(options) {
  */
 Blockly.Block.newFieldVariableFromJson_ = function(options) {
   var varname = Blockly.utils.replaceMessageReferences(options['variable']);
-  return new Blockly.FieldVariable(varname);
+  var variableTypes = options['variableTypes'];
+  return new Blockly.FieldVariable(varname, null, variableTypes);
 };
 
 
 
@@ -690,7 +690,7 @@ Blockly.BlockSvg.prototype.showContextMenu_ = function(e) {
   menuOptions.push(helpOption);
 
   // Allow the block to add or modify menuOptions.
-  if (this.customContextMenu && !block.isInFlyout) {
+  if (this.customContextMenu) {
     this.customContextMenu(menuOptions);
   }
 
@@ -901,10 +901,8 @@ Blockly.BlockSvg.disposeUiStep_ = function(clone, rtl, start, workspaceScale) {
     var scale = (1 - percent) * workspaceScale;
     clone.setAttribute('transform', 'translate(' + x + ',' + y + ')' +
         ' scale(' + scale + ')');
-    var closure = function() {
-      Blockly.BlockSvg.disposeUiStep_(clone, rtl, start, workspaceScale);
-    };
-    setTimeout(closure, 10);
+    setTimeout(Blockly.BlockSvg.disposeUiStep_, 10, clone, rtl, start,
+               workspaceScale);
   }
 };
 
@@ -949,10 +947,8 @@ Blockly.BlockSvg.connectionUiStep_ = function(ripple, start, workspaceScale) {
   } else {
     ripple.setAttribute('r', percent * 25 * workspaceScale);
     ripple.style.opacity = 1 - percent;
-    var closure = function() {
-      Blockly.BlockSvg.connectionUiStep_(ripple, start, workspaceScale);
-    };
-    Blockly.BlockSvg.disconnectUiStop_.pid_ = setTimeout(closure, 10);
+    Blockly.BlockSvg.disconnectUiStop_.pid_ = setTimeout(
+        Blockly.BlockSvg.connectionUiStep_, 10, ripple, start, workspaceScale);
   }
 };
 
@@ -996,11 +992,10 @@ Blockly.BlockSvg.disconnectUiStep_ = function(group, magnitude, start) {
     var skew = Math.round(Math.sin(percent * Math.PI * WIGGLES) *
         (1 - percent) * magnitude);
     group.skew_ = 'skewX(' + skew + ')';
-    var closure = function() {
-      Blockly.BlockSvg.disconnectUiStep_(group, magnitude, start);
-    };
     Blockly.BlockSvg.disconnectUiStop_.group = group;
-    Blockly.BlockSvg.disconnectUiStop_.pid = setTimeout(closure, 10);
+    Blockly.BlockSvg.disconnectUiStop_.pid =
+        setTimeout(Blockly.BlockSvg.disconnectUiStep_, 10, group, magnitude,
+                   start);
   }
   group.setAttribute('transform', group.translate_ + group.skew_);
 };
 
@@ -55,7 +55,7 @@ Blockly.Extensions.MUTATOR_PROPERTIES_ =
  * handlers and mutators. These are applied using Block.applyExtension(), or
  * the JSON "extensions" array attribute.
  * @param {string} name The name of this extension.
- * @param {function} initFn The function to initialize an extended block.
+ * @param {Function} initFn The function to initialize an extended block.
  * @throws {Error} if the extension name is empty, the extension is already
  *     registered, or extensionFn is not a function.
  */
@@ -92,7 +92,7 @@ Blockly.Extensions.registerMixin = function(name, mixinObj) {
  * decompose are defined on the mixin.
  * @param {string} name The name of this mutator extension.
  * @param {!Object} mixinObj The values to mix in.
- * @param {function()=} opt_helperFn An optional function to apply after mixing
+ * @param {(function())=} opt_helperFn An optional function to apply after mixing
  *     in the object.
  * @param {Array.<string>=} opt_blockList A list of blocks to appear in the
  *     flyout of the mutator dialog.
@@ -103,8 +103,10 @@ Blockly.Extensions.registerMutator = function(name, mixinObj, opt_helperFn,
   var errorPrefix = 'Error when registering mutator "' + name + '": ';
 
   // Sanity check the mixin object before registering it.
-  Blockly.Extensions.checkHasFunction_(errorPrefix, mixinObj, 'domToMutation');
-  Blockly.Extensions.checkHasFunction_(errorPrefix, mixinObj, 'mutationToDom');
+  Blockly.Extensions.checkHasFunction_(errorPrefix, mixinObj.domToMutation,
+                                       'domToMutation');
+  Blockly.Extensions.checkHasFunction_(errorPrefix, mixinObj.mutationToDom,
+                                       'mutationToDom');
 
   var hasMutatorDialog = Blockly.Extensions.checkMutatorDialog_(mixinObj,
     errorPrefix);
@@ -162,20 +164,19 @@ Blockly.Extensions.apply = function(name, block, isMutator) {
 };
 
 /**
- * Check that the given object has a property with the given name, and that the
- * property is a function.
+ * Check that the given value is a function.
  * @param {string} errorPrefix The string to prepend to any error message.
- * @param {!Object} object The object to check.
+ * @param {*} func Function to check.
  * @param {string} propertyName Which property to check.
  * @throws {Error} if the property does not exist or is not a function.
  * @private
  */
-Blockly.Extensions.checkHasFunction_ = function(errorPrefix, object,
+Blockly.Extensions.checkHasFunction_ = function(errorPrefix, func,
     propertyName) {
-  if (!object.hasOwnProperty(propertyName)) {
+  if (!func) {
     throw new Error(errorPrefix +
         'missing required property "' + propertyName + '"');
-  } else if (typeof object[propertyName] !== "function") {
+  } else if (typeof func != 'function') {
     throw new Error(errorPrefix +
       '" required property "' + propertyName + '" must be a function');
   }
@@ -442,5 +443,3 @@ Blockly.Extensions.extensionParentTooltip_ = function() {
 };
 Blockly.Extensions.register('parent_tooltip_when_inline',
     Blockly.Extensions.extensionParentTooltip_);
-
-
@@ -38,7 +38,7 @@ goog.require('goog.userAgent');
  * @param {number} width Width of the image.
  * @param {number} height Height of the image.
  * @param {string=} opt_alt Optional alt text for when block is collapsed.
- * @param {function=} opt_onClick Optional function to be called when image is clicked
+ * @param {Function=} opt_onClick Optional function to be called when image is clicked
  * @extends {Blockly.Field}
  * @constructor
  */