Remove closure base file dependency

.travis.yml

@@ -16,8 +16,6 @@ addons:
 env:
  - TRAVIS_CI=true
 before_script:
- # Symlink closure library used by test/jsunit
- - ln -s $(npm root)/google-closure-library ../closure-library
  - export DISPLAY=:99.0
  - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then ( tests/scripts/setup_linux_env.sh ) fi
  - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then ( tests/scripts/setup_osx_env.sh ) fi

build.py

@@ -201,7 +201,7 @@ def gen_core(self):
  # Define the parameters for the POST request.
  params = [
  ("compilation_level", "SIMPLE_OPTIMIZATIONS"),
- ("use_closure_library", "true"),
+ ("use_closure_library", "false"),
  ("output_format", "json"),
  ("output_info", "compiled_code"),
  ("output_info", "warnings"),

core/block.js

@@ -39,6 +39,7 @@ goog.require('Blockly.Input');
 goog.require('Blockly.Mutator');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.utils.string');
 goog.require('Blockly.Warning');
@@ -171,7 +172,7 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
  if (!prototype || typeof prototype != 'object') {
  throw TypeError('Unknown block type: ' + prototypeName);
  }
- goog.mixin(this, prototype);
+ Blockly.utils.object.mixin(this, prototype);
  }
 
  workspace.addTopBlock(this);
@@ -1557,7 +1558,7 @@ Blockly.Block.prototype.mixin = function(mixinObj, opt_disableCheck) {
  JSON.stringify(overwrites));
  }
  }
- goog.mixin(this, mixinObj);
+ Blockly.utils.object.mixin(this, mixinObj);
 };
 
 /**

core/block_events.js

@@ -37,6 +37,7 @@ goog.provide('Blockly.Events.Move'); // Deprecated.
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
 goog.require('Blockly.utils.Coordinate');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.xml');
 
 
@@ -56,7 +57,8 @@ Blockly.Events.BlockBase = function(block) {
  this.blockId = block.id;
  this.workspaceId = block.workspace.id;
 };
-goog.inherits(Blockly.Events.BlockBase, Blockly.Events.Abstract);
+Blockly.utils.object.inherits(Blockly.Events.BlockBase,
+ Blockly.Events.Abstract);
 
 /**
  * Encode the event as JSON.
@@ -97,7 +99,7 @@ Blockly.Events.Change = function(block, element, name, oldValue, newValue) {
  this.oldValue = oldValue;
  this.newValue = newValue;
 };
-goog.inherits(Blockly.Events.Change, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(Blockly.Events.Change, Blockly.Events.BlockBase);
 
 /**
  * Class for a block change event.
@@ -224,7 +226,7 @@ Blockly.Events.Create = function(block) {
  }
  this.ids = Blockly.Events.getDescendantIds_(block);
 };
-goog.inherits(Blockly.Events.Create, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(Blockly.Events.Create, Blockly.Events.BlockBase);
 
 /**
  * Class for a block creation event.
@@ -306,7 +308,7 @@ Blockly.Events.Delete = function(block) {
  }
  this.ids = Blockly.Events.getDescendantIds_(block);
 };
-goog.inherits(Blockly.Events.Delete, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(Blockly.Events.Delete, Blockly.Events.BlockBase);
 
 /**
  * Class for a block deletion event.
@@ -380,7 +382,7 @@ Blockly.Events.Move = function(block) {
  this.oldInputName = location.inputName;
  this.oldCoordinate = location.coordinate;
 };
-goog.inherits(Blockly.Events.Move, Blockly.Events.BlockBase);
+Blockly.utils.object.inherits(Blockly.Events.Move, Blockly.Events.BlockBase);
 
 /**
  * Class for a block move event. Created before the move.

core/block_svg.js

@@ -40,6 +40,7 @@ goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Rect');
 
 
@@ -107,7 +108,7 @@ Blockly.BlockSvg = function(workspace, prototypeName, opt_id) {
  this.svgGroup_.dataset.id = this.id;
  }
 };
-goog.inherits(Blockly.BlockSvg, Blockly.Block);
+Blockly.utils.object.inherits(Blockly.BlockSvg, Blockly.Block);
 
 /**
  * Height of this block, not including any statement blocks above or below.

core/blockly.js

@@ -786,11 +786,3 @@ Blockly.updateBlockStyles_ = function(blocks) {
 Blockly.getTheme = function() {
  return Blockly.theme_;
 };
-
-// Export symbols that would otherwise be renamed by Closure compiler.
-if (!Blockly.utils.global['Blockly']) {
- Blockly.utils.global['Blockly'] = {};
-}
-Blockly.utils.global['Blockly']['getMainWorkspace'] = Blockly.getMainWorkspace;
-Blockly.utils.global['Blockly']['addChangeListener'] =
- Blockly.addChangeListener;

core/comment.js

@@ -32,6 +32,7 @@ goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Icon');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.userAgent');
 
 
@@ -45,7 +46,7 @@ Blockly.Comment = function(block) {
  Blockly.Comment.superClass_.constructor.call(this, block);
  this.createIcon();
 };
-goog.inherits(Blockly.Comment, Blockly.Icon);
+Blockly.utils.object.inherits(Blockly.Comment, Blockly.Icon);
 
 /**
  * Comment text (if bubble is not visible).

core/components/menu/menu.js

@@ -27,8 +27,9 @@
 goog.provide('Blockly.Menu');
 
 goog.require('Blockly.Component');
-goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.aria');
+goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 
 
 /**
@@ -47,7 +48,7 @@ Blockly.Menu = function() {
  */
  this.highlightedIndex_ = -1;
 };
-goog.inherits(Blockly.Menu, Blockly.Component);
+Blockly.utils.object.inherits(Blockly.Menu, Blockly.Component);
 
 
 /**

core/components/menu/menuitem.js

@@ -27,8 +27,9 @@
 goog.provide('Blockly.MenuItem');
 
 goog.require('Blockly.Component');
-goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.aria');
+goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 
 
 /**
@@ -64,7 +65,7 @@ Blockly.MenuItem = function(content, opt_value) {
  */
  this.nextSibling_;
 };
-goog.inherits(Blockly.MenuItem, Blockly.Component);
+Blockly.utils.object.inherits(Blockly.MenuItem, Blockly.Component);
 
 
 /**

core/components/tree/basenode.js

@@ -29,6 +29,7 @@ goog.provide('Blockly.tree.BaseNode');
 
 goog.require('Blockly.Component');
 goog.require('Blockly.utils.aria');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.KeyCodes');
 goog.require('Blockly.utils.style');
 
@@ -112,7 +113,7 @@ Blockly.tree.BaseNode = function(content, config) {
  */
  this.depth_ = -1;
 };
-goog.inherits(Blockly.tree.BaseNode, Blockly.Component);
+Blockly.utils.object.inherits(Blockly.tree.BaseNode, Blockly.Component);
 
 
 /**

core/components/tree/treecontrol.js

@@ -30,6 +30,7 @@ goog.provide('Blockly.tree.TreeControl');
 goog.require('Blockly.tree.TreeNode');
 goog.require('Blockly.tree.BaseNode');
 goog.require('Blockly.utils.aria');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.style');
 
 
@@ -58,7 +59,7 @@ Blockly.tree.TreeControl = function(toolbox, config) {
  */
  this.selectedItem_ = this;
 };
-goog.inherits(Blockly.tree.TreeControl, Blockly.tree.BaseNode);
+Blockly.utils.object.inherits(Blockly.tree.TreeControl, Blockly.tree.BaseNode);
 
 /**
  * Returns the tree.

core/components/tree/treenode.js

@@ -28,6 +28,7 @@
 goog.provide('Blockly.tree.TreeNode');
 
 goog.require('Blockly.tree.BaseNode');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.KeyCodes');
 
 
@@ -46,7 +47,7 @@ Blockly.tree.TreeNode = function(toolbox, content, config) {
  this.toolbox_ = toolbox;
  Blockly.tree.BaseNode.call(this, content, config);
 };
-goog.inherits(Blockly.tree.TreeNode, Blockly.tree.BaseNode);
+Blockly.utils.object.inherits(Blockly.tree.TreeNode, Blockly.tree.BaseNode);
 
 /**
  * Returns the tree.

core/field_angle.js

@@ -31,6 +31,7 @@ goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.FieldTextInput');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.math');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.userAgent');
 
 
@@ -52,7 +53,7 @@ Blockly.FieldAngle = function(opt_value, opt_validator) {
  Blockly.FieldAngle.superClass_.constructor.call(
  this, opt_value, opt_validator);
 };
-goog.inherits(Blockly.FieldAngle, Blockly.FieldTextInput);
+Blockly.utils.object.inherits(Blockly.FieldAngle, Blockly.FieldTextInput);
 
 /**
  * Construct a FieldAngle from a JSON arg object.

core/field_checkbox.js

@@ -31,6 +31,7 @@ goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Size');
 
 
@@ -68,7 +69,7 @@ Blockly.FieldCheckbox = function(opt_value, opt_validator, opt_config) {
 
  this.configure_(opt_config);
 };
-goog.inherits(Blockly.FieldCheckbox, Blockly.Field);
+Blockly.utils.object.inherits(Blockly.FieldCheckbox, Blockly.Field);
 
 /**
  * Construct a FieldCheckbox from a JSON arg object.

core/field_colour.js

@@ -32,9 +32,10 @@ goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.utils.aria');
+goog.require('Blockly.utils.colour');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.IdGenerator');
-goog.require('Blockly.utils.colour');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Size');
 
 
@@ -61,7 +62,7 @@ Blockly.FieldColour = function(opt_value, opt_validator, opt_config) {
 
  this.configure_(opt_config);
 };
-goog.inherits(Blockly.FieldColour, Blockly.Field);
+Blockly.utils.object.inherits(Blockly.FieldColour, Blockly.Field);
 
 /**
  * Construct a FieldColour from a JSON arg object.

core/field_date.js

@@ -30,6 +30,7 @@ goog.require('Blockly.Events');
 goog.require('Blockly.Field');
 goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.string');
 
 goog.require('goog.date');
@@ -55,9 +56,10 @@ Blockly.FieldDate = function(opt_value, opt_validator) {
  if (!opt_value) {
  opt_value = new goog.date.Date().toIsoString(true);
  }
- Blockly.FieldDate.superClass_.constructor.call(this, opt_value, opt_validator);
+ Blockly.FieldDate.superClass_.constructor.call(this,
+ opt_value, opt_validator);
 };
-goog.inherits(Blockly.FieldDate, Blockly.Field);
+Blockly.utils.object.inherits(Blockly.FieldDate, Blockly.Field);
 
 /**
  * Construct a FieldDate from a JSON arg object.
@@ -325,3 +327,34 @@ Blockly.FieldDate.CSS = [
 ];
 
 Blockly.fieldRegistry.register('field_date', Blockly.FieldDate);
+
+
+/**
+ * Back up original getMsg function.
+ * @type {!Function}
+ */
+goog.getMsgOrig = goog.getMsg;
+
+/**
+ * Gets a localized message.
+ * Overrides the default Closure function to check for a Blockly.Msg first.
+ * Used infrequently, only known case is TODAY button in date picker.
+ * @param {string} str Translatable string, places holders in the form {$foo}.
+ * @param {Object.<string, string>=} opt_values Maps place holder name to value.
+ * @return {string} Message with placeholders filled.
+ * @suppress {duplicate}
+ */
+goog.getMsg = function(str, opt_values) {
+ var key = goog.getMsg.blocklyMsgMap[str];
+ if (key) {
+ str = Blockly.Msg[key];
+ }
+ return goog.getMsgOrig(str, opt_values);
+};
+
+/**
+ * Mapping of Closure messages to Blockly.Msg names.
+ */
+goog.getMsg.blocklyMsgMap = {
+ 'Today': 'TODAY'
+};

core/field_dropdown.js

@@ -36,6 +36,7 @@ goog.require('Blockly.Menu');
 goog.require('Blockly.MenuItem');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Size');
 goog.require('Blockly.utils.string');
 goog.require('Blockly.utils.uiMenu');
@@ -82,7 +83,7 @@ Blockly.FieldDropdown = function(menuGenerator, opt_validator) {
  */
  this.selectedMenuItem_ = null;
 };
-goog.inherits(Blockly.FieldDropdown, Blockly.Field);
+Blockly.utils.object.inherits(Blockly.FieldDropdown, Blockly.Field);
 
 /**
  * Dropdown image properties.

core/field_image.js

@@ -30,6 +30,7 @@ goog.require('Blockly.Field');
 goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Size');
 
 
@@ -90,7 +91,7 @@ Blockly.FieldImage = function(src, width, height,
  this.clickHandler_ = opt_onClick;
  }
 };
-goog.inherits(Blockly.FieldImage, Blockly.Field);
+Blockly.utils.object.inherits(Blockly.FieldImage, Blockly.Field);
 
 /**
  * Construct a FieldImage from a JSON arg object,

core/field_label.js

@@ -31,6 +31,7 @@ goog.require('Blockly.Field');
 goog.require('Blockly.fieldRegistry');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 goog.require('Blockly.utils.Size');
 
 
@@ -51,7 +52,7 @@ Blockly.FieldLabel = function(opt_value, opt_class) {
  }
  this.setValue(opt_value);
 };
-goog.inherits(Blockly.FieldLabel, Blockly.Field);
+Blockly.utils.object.inherits(Blockly.FieldLabel, Blockly.Field);
 
 /**
  * Construct a FieldLabel from a JSON arg object,