aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
diff options
context:
space:
mode:
Diffstat (limited to 'js/mediators')
-rw-r--r--js/mediators/io-mediator.js8
-rwxr-xr-xjs/mediators/keyboard-mediator.js2
2 files changed, 8 insertions, 2 deletions
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index c487fef5..c9ea0468 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -205,9 +205,15 @@ exports.IoMediator = Montage.create(Component, {
205 value: function (file, callback) { 205 value: function (file, callback) {
206 //TODO: Implement Delete functionality 206 //TODO: Implement Delete functionality
207 } 207 }
208 } 208 },
209 //////////////////////////////////////////////////////////////////// 209 ////////////////////////////////////////////////////////////////////
210 //////////////////////////////////////////////////////////////////// 210 ////////////////////////////////////////////////////////////////////
211 createFileFromBinary:{
212 enumerable: false,
213 value: function(blob, filename){
214
215 }
216 }
211}); 217});
212//////////////////////////////////////////////////////////////////////// 218////////////////////////////////////////////////////////////////////////
213//////////////////////////////////////////////////////////////////////// \ No newline at end of file 219//////////////////////////////////////////////////////////////////////// \ No newline at end of file
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 196c8a4b..27c3731c 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -114,7 +114,7 @@ exports.KeyboardMediator = Montage.create(Component, {
114 114
115 115
116 // Shortcut for Selection Tool is V 116 // Shortcut for Selection Tool is V
117 if(evt.keyCode === Keyboard.V) { 117 if((evt.keyCode === Keyboard.V) && !(evt.ctrlKey || evt.metaKey)) {
118 evt.preventDefault(); 118 evt.preventDefault();
119 this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex] }); 119 this.application.ninja.handleSelectTool({ "detail": this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex] });
120 return; 120 return;