yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update packages and reorder scripts

Browse source 
- Didn't update everything to the absolute latest since there are
  compatibility issues
- Reordered jquery above angular to fix some issues
This commit is contained in:
Carey Metcalfe 2017-10-27 19:41:32 -04:00
parent 63a6188d46
commit 904d410c05
5 changed files with 1627 additions and 1752 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/index.html
View file

@ -84,13 +84,13 @@
<!-- build:js({.,app}) scripts/vendor.min.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/jquery-ui/jquery-ui.js"></script>
<script src="bower_components/jplayer/dist/jplayer/jquery.jplayer.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/jquery-ui/jquery-ui.js"></script>
<script src="bower_components/jplayer/dist/jplayer/jquery.jplayer.js"></script>
<script src="bower_components/jquery-mousewheel/jquery.mousewheel.js"></script>
<script src="bower_components/fancybox/source/jquery.fancybox.js"></script>
<script src="bower_components/notify.js/notify.js"></script>

6
bower.json
View file

@ -26,14 +26,14 @@
},
"main": "app/index.html",
"dependencies": {
"jquery": "~2.1.4",
"jquery-ui": "~1.11.4",
"jplayer": "~2.9.2",
"angular": "~1.4.1",
"angular-route": "~1.4.1",
"angular-sanitize": "~1.4.1",
"angular-cookies": "~1.4.1",
"angular-resource": "~1.4.1",
"jquery": "~2.1.4",
"jquery-ui": "~1.11.4",
"jplayer": "~2.9.2",
"fancybox": "~2.1.4",
"notify.js": "<=1.2.2",
"jquery.scrollTo": "~1.4.5",

4
karma.conf.js
View file

@ -20,13 +20,13 @@ module.exports = function (config) {
files: [
// bower:
'bower_components/jquery/dist/jquery.js',
'bower_components/jquery-ui/jquery-ui.js',
'bower_components/jplayer/dist/jplayer/jquery.jplayer.js',
'bower_components/angular/angular.js',
'bower_components/angular-route/angular-route.js',
'bower_components/angular-sanitize/angular-sanitize.js',
'bower_components/angular-cookies/angular-cookies.js',
'bower_components/angular-resource/angular-resource.js',
'bower_components/jquery-ui/jquery-ui.js',
'bower_components/jplayer/dist/jplayer/jquery.jplayer.js',
'bower_components/jquery-mousewheel/jquery.mousewheel.js',
'bower_components/fancybox/source/jquery.fancybox.js',
'bower_components/notify.js/notify.js',

3325
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

40
package.json
View file

@ -28,32 +28,32 @@
"main": "app/index.html",
"dependencies": {},
"devDependencies": {
"grunt": "^0.4.5",
"grunt-bump": "^0.3.1",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-connect": "^0.10.1",
"grunt-contrib-copy": "^0.8.0",
"grunt-contrib-cssmin": "^0.12.3",
"grunt-contrib-htmlmin": "^0.4.0",
"grunt": "^1.0.1",
"grunt-bump": "^0.8.0",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^1.0.2",
"grunt-contrib-htmlmin": "^2.0.0",
"grunt-contrib-imagemin": "^1.0.1",
"grunt-contrib-uglify": "^0.9.1",
"grunt-contrib-watch": "^0.6.1",
"grunt-contrib-uglify": "^2.0.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-filerev": "^2.3.1",
"grunt-karma": "^0.10.1",
"grunt-karma": "^2.0.0",
"grunt-notify": "^0.4.1",
"grunt-ssh": "^0.12.3",
"grunt-svg-sprite": "^1.1.2",
"grunt-usemin": "^3.0.0",
"grunt-wiredep": "^2.0.0",
"jasmine-core": "^2.6.1",
"jit-grunt": "^0.9.1",
"karma": "^0.12.32",
"karma-chrome-launcher": "^0.1.12",
"karma-coverage": "^0.3.1",
"karma-jasmine": "^0.3.5",
"karma-ng-html2js-preprocessor": "^0.1.2",
"karma-notify-reporter": "^0.1.1",
"grunt-wiredep": "^3.0.1",
"jasmine-core": "^2.5.2",
"jit-grunt": "^0.10.0",
"karma": "^1.3.0",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-jasmine": "^1.0.2",
"karma-ng-html2js-preprocessor": "^1.0.0",
"karma-notify-reporter": "^1.0.1",
"time-grunt": "^1.2.1"
},
"engines": {