Merge pull request #606 from openfin/alpha

v2.0.2 Master

README.md

@@ -15,7 +15,7 @@ Below is an example custom application built ontop of the Hypergrid API tooling.
 * [Roadmap](https://github.com/openfin/fin-hypergrid/blob/master/README.md#roadmap)
 * [Contributing](https://github.com/openfin/fin-hypergrid/blob/master/README.md#contributors)
 
-### Current Release (2.0.0 - 16 May 2017)
+### Current Release (2.0.2 - 4 June 2017)
 
 2.0 reflects a substantial simplification of the core functionality of the grid to just customized rendering. The rendering engine does allow support for showing sorting, filtering, grouping, etc. but specific logic on how a user may want to do that is not apart for this project. Demos will be made available on the [wiki](https://github.com/openfin/fin-hypergrid/wiki) for this.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fin-hypergrid",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Canvas-based high-performance spreadsheet",
   "repository": {
     "type": "git",

src/Hypergrid.js

@@ -286,25 +286,6 @@ var Hypergrid = Base.extend('Hypergrid', {
     clearState: function() {
         this._theme = Object.create(defaults);
 
-        /**
-         * @summary The theme layer in the properties hierarchy.
-         * @desc The theme layer is the second layer, above the `defaults` layer, and below the `properties` layer.
-         * Attempting to reset the theme throws an error (to guard against confusion with the `properties.theme` setter).
-         * @name theme
-         * @type {object}
-         * @summary The prototype layer where theme look and feel properties can be defined.
-         * @type {object}
-         * @memberOf Hypergrid#
-         */
-        Object.defineProperty(this, 'theme', {
-            get: function() {
-                return this._theme;
-            },
-            set: function(theme) {
-                throw new this.HypergridError('Cannot reset grid.theme (properties layer). Use grid.applyTheme or the grid.properties.theme setter to apply a new theme.');
-            }
-        });
-
         /**
          * @name properties
          * @type {object}
@@ -2229,6 +2210,23 @@ var Hypergrid = Base.extend('Hypergrid', {
             : themeName in Hypergrid.themes
             ? themeName // registered theme name
             : theme; // unregistered theme object
+    },
+
+    /**
+     * @summary The theme layer in the properties hierarchy.
+     * @desc The theme layer is the second layer, above the `defaults` layer, and below the `properties` layer.
+     * Attempting to reset the theme throws an error (to guard against confusion with the `properties.theme` setter).
+     * @name theme
+     * @type {object}
+     * @summary The prototype layer where theme look and feel properties can be defined.
+     * @type {object}
+     * @memberOf Hypergrid#
+     */
+    get theme() {
+        return this._theme;
+    },
+    set theme(theme) {
+        console.warn('Attempt to reset grid.theme (properties layer). Use grid.applyTheme or the grid.properties.theme setter to apply a new theme.');
     }
 });