From 3907c48efe713a557e528ca8a033f06acaaeebc8 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Sat, 18 Jan 2014 05:26:06 +0400
Subject: [PATCH] removed duplicate action definition...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui/keybindings.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/ui/keybindings.js b/ui/keybindings.js
index c6a88fd3..140d5b51 100755
--- a/ui/keybindings.js
+++ b/ui/keybindings.js
@@ -42,7 +42,13 @@ function Action(text, func){
 	func = func == null ? function(){return true}: func
 	func.doc = text
 
-	ACTIONS[text.split('\n')[0].trim()] = func
+	var name = text.split('\n')[0].trim()
+
+	if(name in ACTIONS){
+		console.warn('Action: "'+name+'" is defined more than once.')
+	}
+
+	ACTIONS[name] = func
 
 	return func
 }
@@ -743,20 +749,20 @@ var KEYBOARD_CONFIG = {
 						markAll('all') 
 					}),
 			},
+		'unmark-ribbon': doc('Unmark current ribbon', 
+				function(){ 
+					event.preventDefault()
+					removeImageMarks('ribbon') 
+				}),
 		D: {
-				ctrl: doc('Unmark current ribbon', 
-					function(){ 
-						event.preventDefault()
-						removeImageMarks('ribbon') 
-					}),
+				ctrl: 'unmark-ribbon',
 				'ctrl+shift': doc('Unmark all images', 
 					function(){ removeImageMarks('all') }),
 			},
 		U: {
 				default: doc('Unmark current image',
 					function(){ toggleMark('off') }), 
-				ctrl: doc('Unmark current ribbon', 
-					function(){ removeImageMarks('ribbon') }),
+				ctrl: 'unmark-ribbon',
 				shift: doc('Unamrk all', 
 					function(){ removeImageMarks('all') }),
 			},