mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Sync upstream Jan 31 2016

Browse Source
This commit is contained in:
Smie Grin 2016-01-31 16:41:34 -07:00
commit 3b6c5aa7a4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -25,13 +25,13 @@
"grunt-contrib-watch": "0.6.1", "grunt-contrib-watch": "0.6.1",
"grunt-ghost": "1.1.0", "grunt-ghost": "1.1.0",
"grunt-include-replace": "3.2.0", "grunt-include-replace": "3.2.0",
"grunt-jscs": "2.6.0", "grunt-jscs": "2.7.0",
"grunt-karma": "0.12.1", "grunt-karma": "0.12.1",
"grunt-leading-indent": "0.2.0", "grunt-leading-indent": "0.2.0",
"grunt-nw-builder": "2.0.0", "grunt-nw-builder": "2.0.0",
"grunt-open": "0.2.3", "grunt-open": "0.2.3",
"grunt-replace": "0.11.0", "grunt-replace": "0.11.0",
"grunt-spritesmith": "6.1.1", "grunt-spritesmith": "6.2.0",
"jasmine-core": "2.1.0", "jasmine-core": "2.1.0",
"karma": "0.13.19", "karma": "0.13.19",
"karma-chrome-launcher": "0.2.2", "karma-chrome-launcher": "0.2.2",

2
test/js/service/keyboard/ShortcutServiceTest.js
View File

@ -20,8 +20,10 @@ describe("ShortcutService test suite", function() {
return this; return this;
}, },
ctrlKey : false, ctrlKey : false,
metaKey : false,
withCtrlKey : function () { withCtrlKey : function () {
this.ctrlKey = true; this.ctrlKey = true;
this.metaKey = true;
return this; return this;
}, },
shiftKey : false, shiftKey : false,