Update jquery
This commit is contained in:
parent
caa6251632
commit
5e5c442442
2 changed files with 6 additions and 5 deletions
|
@ -33,15 +33,15 @@
|
|||
|
||||
<!-- build:js(tmp/result) assets/vendor.min.js -->
|
||||
|
||||
<script src="/vendor/jquery/jquery.js"></script>
|
||||
|
||||
<!-- @if dist=false -->
|
||||
<script src="/vendor/jquery/dist/jquery.js"></script>
|
||||
<script src="/vendor/handlebars/handlebars.js"></script>
|
||||
<script src="/vendor/ember/ember.js"></script>
|
||||
<script src="/vendor/ember-data/ember-data.js"></script>
|
||||
<script src="/vendor/ember-data-extensions/dist/embedded-adapter.js"></script>
|
||||
<!-- @endif -->
|
||||
<!-- @if dist=true -->
|
||||
<script src="/vendor/jquery/dist/jquery.min.js"></script>
|
||||
<script src="/vendor/handlebars/handlebars.runtime.js"></script>
|
||||
<script src="/vendor/ember/ember.prod.js"></script>
|
||||
<script src="/vendor/ember-data/ember-data.prod.js"></script>
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
"name": "croodle",
|
||||
"dependencies": {
|
||||
"handlebars": "~1.3.0",
|
||||
"jquery": "~1.10.2",
|
||||
"jquery": "~1.11.1",
|
||||
"qunit": "~1.12.0",
|
||||
"ember-qunit": "https://github.com/rpflorence/ember-qunit.git#master",
|
||||
"ember-qunit": "0.1.8",
|
||||
"ember": "~1.7.0",
|
||||
"ember-data": "~1.0.0",
|
||||
"ember-resolver": "~0.1.1",
|
||||
|
@ -21,6 +21,7 @@
|
|||
"ember-data-extensions": "~1.0.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"ember": "~1.7.0"
|
||||
"ember": "~1.7.0",
|
||||
"jquery": "~1.11.1"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue