Merge pull request #12793 from rwjblue/remove-jquery-assertion

[BUGFIX release-1-13] Remove jQuery version assertion.
emberjs · Jan 9, 2016 · f34af07 · f34af07
2 parents 10ab23d + a9ac424
commit f34af07
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/packages/ember-views/lib/system/jquery.js b/packages/ember-views/lib/system/jquery.js
@@ -1,5 +1,4 @@
 import Ember from 'ember-metal/core';
-import { assert } from 'ember-metal/debug';
 
 // ES6TODO: the functions on EnumerableUtils need their own exports
 import environment from 'ember-metal/environment';
@@ -13,11 +12,6 @@ if (environment.hasDOM) {
     jQuery = require('jquery');
   }
 
-  assert(
-    'Ember Views require jQuery between 1.7 and 2.1',
-    jQuery && (jQuery().jquery.match(/^((1\.(7|8|9|10|11))|(2\.(0|1)))(\.\d+)?(pre|rc\d?)?/) || Ember.ENV.FORCE_JQUERY)
-  );
-
   if (jQuery) {
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#dndevents
     var dragEvents = [

diff --git a/tests/index.html b/tests/index.html
@@ -68,9 +68,6 @@
         // Handle testing feature flags
         ENV['ENABLE_OPTIONAL_FEATURES'] = !!QUnit.urlParams.enableoptionalfeatures;
 
-        // Don't worry about jQuery version
-        ENV['FORCE_JQUERY'] = true;
-
         ENV['RAISE_ON_DEPRECATION'] = true;
       })();
     </script>