From 6ae8ef05363fa3fc3d06deaf919de1a70044537a Mon Sep 17 00:00:00 2001 From: ccd0 Date: Fri, 23 Jan 2015 22:37:07 -0800 Subject: [PATCH] Fix merge error. --- builds/appchan-x.user.js | 2 +- builds/crx/script.js | 2 +- src/Images/Gallery.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index df59aa436..3225870b7 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -11318,7 +11318,7 @@ case 'Right': return Gallery.cb.next; case 'Enter': - return Gallery.cb.advance; + return Gallery.cb.enterKey; case 'Left': case '': return Gallery.cb.prev; diff --git a/builds/crx/script.js b/builds/crx/script.js index 0322d6c7e..43c6415bd 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -11354,7 +11354,7 @@ case 'Right': return Gallery.cb.next; case 'Enter': - return Gallery.cb.advance; + return Gallery.cb.enterKey; case 'Left': case '': return Gallery.cb.prev; diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee index b93bf7bb3..1411978d4 100644 --- a/src/Images/Gallery.coffee +++ b/src/Images/Gallery.coffee @@ -219,7 +219,7 @@ Gallery = when 'Right' Gallery.cb.next when 'Enter' - Gallery.cb.advance + Gallery.cb.enterKey when 'Left', '' Gallery.cb.prev when Conf['Pause']