From be3c761fc0407a4892f6e44a112baa61543ecf09 Mon Sep 17 00:00:00 2001
From: rachel-fenichel <fenichel@google.com>
Date: Tue, 29 Mar 2016 15:22:45 -0700
Subject: [PATCH] lint

---
 core/inject.js  | 2 +-
 core/options.js | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/inject.js b/core/inject.js
index e105b6b50..2e8d93a5d 100644
--- a/core/inject.js
+++ b/core/inject.js
@@ -26,8 +26,8 @@
 
 goog.provide('Blockly.inject');
 
-goog.require('Blockly.Options');
 goog.require('Blockly.Css');
+goog.require('Blockly.Options');
 goog.require('Blockly.WorkspaceSvg');
 goog.require('goog.dom');
 goog.require('goog.ui.Component');
diff --git a/core/options.js b/core/options.js
index 19a848105..83c084511 100644
--- a/core/options.js
+++ b/core/options.js
@@ -32,8 +32,7 @@ goog.provide('Blockly.Options');
  * is unspecified.
  * @param {!Object} options Dictionary of options.  Specification:
  *   https://developers.google.com/blockly/installation/overview#configuration
- * @return {!Blockly.Options} Object containing a dicitonary of normalized
- *   options.
+ * @constructor
  */
 Blockly.Options = function(options) {
   var readOnly = !!options['readOnly'];
@@ -108,6 +107,10 @@ Blockly.Options = function(options) {
   this.realtimeOptions = realtimeOptions;
 };
 
+/**
+ * @type {Blockly.Workspace} the parent of the current workspace, or null if
+ *    there is no parent workspace.
+ **/
 Blockly.Options.prototype.parentWorkspace = null;
 
 /**
@@ -127,7 +130,7 @@ Blockly.Options.prototype.getMetrics = function() { return null; };
  * Parse the user-specified zoom options, using reasonable defaults where
  * behaviour is unspecified.  See zoom documentation:
  *   https://developers.google.com/blockly/installation/zoom
- * @param {!Object} options Dictionary of options options.
+ * @param {!Object} options Dictionary of options.
  * @return {!Object} A dictionary of normalized options.
  * @private
  */