1
0
Fork 0

Updated jasmine

This commit is contained in:
Michaël Lemaire 2018-03-11 23:19:45 +01:00
parent e41cfa8299
commit e1fa5bdc00
5 changed files with 17 additions and 37 deletions

39
package-lock.json generated
View File

@ -1910,12 +1910,6 @@
"safe-buffer": "5.1.1"
}
},
"exit": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
"dev": true
},
"expand-braces": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
@ -3582,36 +3576,27 @@
}
},
"jasmine": {
"version": "2.99.0",
"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.99.0.tgz",
"integrity": "sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.1.0.tgz",
"integrity": "sha1-K9Wf1+xuwOistk4J9Fpo7SrRlSo=",
"dev": true,
"requires": {
"exit": "0.1.2",
"glob": "7.1.2",
"jasmine-core": "2.99.1"
"jasmine-core": "3.1.0"
},
"dependencies": {
"glob": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"dev": true,
"requires": {
"fs.realpath": "1.0.0",
"inflight": "1.0.6",
"inherits": "2.0.3",
"minimatch": "3.0.4",
"once": "1.4.0",
"path-is-absolute": "1.0.1"
}
"jasmine-core": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.1.0.tgz",
"integrity": "sha1-pHheE11d9lAk38kiSVPfWFvSdmw=",
"dev": true
}
}
},
"jasmine-core": {
"version": "2.99.1",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
"integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU="
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.1.0.tgz",
"integrity": "sha1-pHheE11d9lAk38kiSVPfWFvSdmw="
},
"js-yaml": {
"version": "3.11.0",

View File

@ -23,7 +23,7 @@
"gamefroot-texture-packer": "Gamefroot/Gamefroot-Texture-Packer.git#f3687111afc94f80ea8f2877c188fb8e2004e8ff",
"glob": "^7.1.2",
"glob-watcher": "^5.0.1",
"jasmine": "^2.9.0",
"jasmine": "^3.1.0",
"karma": "^2.0.0",
"karma-coverage": "1.1.1",
"karma-jasmine": "^1.1.1",
@ -37,7 +37,7 @@
"uglify-js": "^3.3.13"
},
"dependencies": {
"jasmine-core": "^2.9.1",
"jasmine-core": "^3.1.0",
"parse": "^1.11.0",
"phaser": "2.6.2"
}

View File

@ -42,7 +42,7 @@ function ts(dist = false) {
* Start watching for typescript changes
*/
function watch_ts() {
watch(["./src/**/*.ts"], ts);
watch(["./src/**/*.ts", "package.json"], () => ts());
}
/**
@ -134,7 +134,7 @@ function data() {
* Start watch for data changes
*/
function watch_data() {
watch(["./data/**/*.*"], data);
watch(["./data/**/*.*"], () => data());
}
/**
@ -154,7 +154,7 @@ function vendors() {
* Start watching for vendors changes
*/
function watch_vendors() {
watch(['package.json'], vendors);
watch(['package.json'], () => vendors());
}
/**

View File

@ -34,9 +34,6 @@ module TK.SpaceTac {
border = 50
ship_separation = 100
// Timer to use for scheduled things
timer = Timer.global
// Indicator that an AI is playing
ai_playing = false

View File

@ -80,8 +80,6 @@ module TK.SpaceTac.UI {
this.background = null;
this.multi = new MultiBattle();
this.battle.timer = this.timer;
this.toggle_tactical_mode = new Toggle(
() => this.arena.setTacticalMode(true),
() => this.arena.setTacticalMode(false)