Stable Version 2.8.2

js-data · Nov 4, 2015 · cca8687 · cca8687
1 parent bf774b4
commit cca8687
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+##### 2.8.2 - 04 November 2015
+
+###### Backwards compatible bug fixes
+- #258 - CSP violations due to use of new Function()
+
 ##### 2.8.1 - 02 November 2015
 
 ###### Backwards compatible bug fixes

diff --git a/dist/js-data-debug.js b/dist/js-data-debug.js
@@ -1,6 +1,6 @@
 /*!
  * js-data
- * @version 2.8.1 - Homepage <http://www.js-data.io/>
+ * @version 2.8.2 - Homepage <http://www.js-data.io/>
  * @author Jason Dobry <jason.dobry@gmail.com>
  * @copyright (c) 2014-2015 Jason Dobry 
  * @license MIT <https://github.com/js-data/js-data/blob/master/LICENSE>
@@ -84,10 +84,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return new _datastoreIndex['default'](options);
 	  },
 	  version: {
-	    full: '2.8.1',
+	    full: '2.8.2',
 	    major: parseInt('2', 10),
 	    minor: parseInt('8', 10),
-	    patch: parseInt('1', 10),
+	    patch: parseInt('2', 10),
 	    alpha:  true ? 'false' : false,
 	    beta:  true ? 'false' : false
 	  }
@@ -231,6 +231,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	defaultsPrototype.beforeValidate = lifecycleNoopCb;
 	defaultsPrototype.bypassCache = false;
 	defaultsPrototype.cacheResponse = !!_utils['default'].w;
+	defaultsPrototype.csp = false;
 	defaultsPrototype.clearEmptyQueries = true;
 	defaultsPrototype.computed = {};
 	defaultsPrototype.defaultAdapter = 'http';
@@ -3531,13 +3532,21 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      try {
 	        if (typeof def.useClass === 'function') {
-	          def[_class] = new Function('def', 'return function ' + _class + '() { def.useClass.call(this); }')(def); // eslint-disable-line
+	          if (def.csp) {
+	            def[_class] = function () {
+	              def.useClass.call(this);
+	            };
+	          } else {
+	            def[_class] = new Function('def', 'return function ' + _class + '() { def.useClass.call(this); }')(def); // eslint-disable-line
+	          }
 	          def[_class].prototype = (function (proto) {
 	            function Ctor() {}
 
 	            Ctor.prototype = proto;
 	            return new Ctor();
 	          })(def.useClass.prototype);
+	        } else if (def.csp) {
+	          def[_class] = function () {};
 	        } else {
 	          def[_class] = new Function('return function ' + _class + '() {}')(); // eslint-disable-line
 	        }

diff --git a/dist/js-data.js b/dist/js-data.js
@@ -1,6 +1,6 @@
 /*!
  * js-data
- * @version 2.8.1 - Homepage <http://www.js-data.io/>
+ * @version 2.8.2 - Homepage <http://www.js-data.io/>
  * @author Jason Dobry <jason.dobry@gmail.com>
  * @copyright (c) 2014-2015 Jason Dobry 
  * @license MIT <https://github.com/js-data/js-data/blob/master/LICENSE>
@@ -84,10 +84,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return new _datastoreIndex['default'](options);
 	  },
 	  version: {
-	    full: '2.8.1',
+	    full: '2.8.2',
 	    major: parseInt('2', 10),
 	    minor: parseInt('8', 10),
-	    patch: parseInt('1', 10),
+	    patch: parseInt('2', 10),
 	    alpha:  true ? 'false' : false,
 	    beta:  true ? 'false' : false
 	  }
@@ -231,6 +231,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	defaultsPrototype.beforeValidate = lifecycleNoopCb;
 	defaultsPrototype.bypassCache = false;
 	defaultsPrototype.cacheResponse = !!_utils['default'].w;
+	defaultsPrototype.csp = false;
 	defaultsPrototype.clearEmptyQueries = true;
 	defaultsPrototype.computed = {};
 	defaultsPrototype.defaultAdapter = 'http';
@@ -3520,13 +3521,21 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      try {
 	        if (typeof def.useClass === 'function') {
-	          def[_class] = new Function('def', 'return function ' + _class + '() { def.useClass.call(this); }')(def); // eslint-disable-line
+	          if (def.csp) {
+	            def[_class] = function () {
+	              def.useClass.call(this);
+	            };
+	          } else {
+	            def[_class] = new Function('def', 'return function ' + _class + '() { def.useClass.call(this); }')(def); // eslint-disable-line
+	          }
 	          def[_class].prototype = (function (proto) {
 	            function Ctor() {}
 
 	            Ctor.prototype = proto;
 	            return new Ctor();
 	          })(def.useClass.prototype);
+	        } else if (def.csp) {
+	          def[_class] = function () {};
 	        } else {
 	          def[_class] = new Function('return function ' + _class + '() {}')(); // eslint-disable-line
 	        }

diff --git a/dist/js-data.min.js b/dist/js-data.min.js
diff --git a/dist/js-data.min.map b/dist/js-data.min.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data",
   "description": "Robust, framework-agnostic in-memory data store.",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "homepage": "http://www.js-data.io",
   "repository": {
     "type": "git",