Skip to content

Commit

Permalink
Merge pull request #344 from videogular/chore/migrate-to-core-js
Browse files Browse the repository at this point in the history
chore(package): Migrate to core-js
  • Loading branch information
Elecash authored Dec 29, 2016
2 parents 491be8b + 8b0b38b commit 062edf3
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013 2fdevs
Copyright (c) 2013 ByteDefault SL

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function(config) {

files: [
// Polyfills.
'node_modules/es6-shim/es6-shim.js',
'node_modules/core-js/client/shim.min.js',

'node_modules/reflect-metadata/Reflect.js',

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/videogular/videogular2"
},
"dependencies": {
"es6-shim": "0.35.2",
"core-js": "2.4.1",
"reflect-metadata": "0.1.9",
"rxjs": "5.0.0-beta.12",
"systemjs": "0.19.40",
Expand All @@ -21,7 +21,7 @@
"@angular/platform-browser": "2.2.3",
"@angular/platform-browser-dynamic": "2.2.3",
"@angular/platform-server": "2.2.3",
"@types/es6-shim": "0.31.32",
"@types/core-js": "0.9.35",
"@types/jasmine": "2.5.38",
"codelyzer": "2.0.0-beta.1",
"commitizen": "2.9.3",
Expand All @@ -39,7 +39,7 @@
"remap-istanbul": "0.8.0",
"semantic-release": "6.3.2",
"tslint": "4.2.0",
"typescript": "2.0.10",
"typescript": "2.1.4",
"watch": "1.0.1"
},
"scripts": {
Expand Down
3 changes: 0 additions & 3 deletions src/controls/vg-playback-button/vg-playback-button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {VgAPI} from '../../core/services/vg-api';
:host {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
Expand All @@ -21,8 +20,6 @@ import {VgAPI} from '../../core/services/vg-api';
cursor: pointer;
color: white;
line-height: 50px;
width: 50px;
color: white;
font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
}
`]
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"moduleResolution": "node"
},
"exclude": [
"node_modules",
"coverage",
"examples"
"node_modules/*",
"coverage/*",
"compiled/*"
],
"angularCompilerOptions": {
"genDir": "compiled"
Expand Down

0 comments on commit 062edf3

Please sign in to comment.