diff options
| -rw-r--r-- | Gruntfile.js | 5 | ||||
| -rw-r--r-- | bower.json | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index e1638dcb6..6a711962b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -221,6 +221,7 @@ grunt.initConfig({ all: { options: { clean: true, + ignore: [ "jquery" ], destPrefix: "external" }, files: { @@ -233,8 +234,8 @@ grunt.initConfig({ "jshint/jshint.js": "jshint/dist/jshint.js", "jshint/LICENSE": "jshint/LICENSE", - "jquery/jquery.js": "jquery/jquery.js", - "jquery/MIT-LICENSE.txt": "jquery/MIT-LICENSE.txt", + "jquery/jquery.js": "jquery-1.x/jquery.js", + "jquery/MIT-LICENSE.txt": "jquery-1.x/MIT-LICENSE.txt", "jquery-1.6.0/jquery.js": "jquery-1.6.0/jquery.js", "jquery-1.6.0/MIT-LICENSE.txt": "jquery-1.6.0/MIT-LICENSE.txt", diff --git a/bower.json b/bower.json index a871f9e29..b3b4cd5ad 100644 --- a/bower.json +++ b/bower.json @@ -8,7 +8,7 @@ "tests" ], "dependencies": { - "jquery": ">=1.6 <1.11" + "jquery": ">=1.6" }, "devDependencies": { "jquery-mousewheel": "3.1.11", @@ -32,7 +32,7 @@ "jquery-1.10.0": "jquery#1.10.0", "jquery-1.10.1": "jquery#1.10.1", "jquery-1.10.2": "jquery#1.10.2", - "jquery": "jquery#1.10.2", + "jquery-1.x": "jquery#1.10.2", "jquery-2.0.0": "jquery#2.0.0", "jquery-2.0.1": "jquery#2.0.1", "jquery-2.0.2": "jquery#2.0.2", |