Fix merge error.

This commit is contained in:
ccd0 2015-01-23 22:37:07 -08:00
parent 084e9ffbe8
commit 6ae8ef0536
3 changed files with 3 additions and 3 deletions

View File

@ -11318,7 +11318,7 @@
case 'Right': case 'Right':
return Gallery.cb.next; return Gallery.cb.next;
case 'Enter': case 'Enter':
return Gallery.cb.advance; return Gallery.cb.enterKey;
case 'Left': case 'Left':
case '': case '':
return Gallery.cb.prev; return Gallery.cb.prev;

View File

@ -11354,7 +11354,7 @@
case 'Right': case 'Right':
return Gallery.cb.next; return Gallery.cb.next;
case 'Enter': case 'Enter':
return Gallery.cb.advance; return Gallery.cb.enterKey;
case 'Left': case 'Left':
case '': case '':
return Gallery.cb.prev; return Gallery.cb.prev;

View File

@ -219,7 +219,7 @@ Gallery =
when 'Right' when 'Right'
Gallery.cb.next Gallery.cb.next
when 'Enter' when 'Enter'
Gallery.cb.advance Gallery.cb.enterKey
when 'Left', '' when 'Left', ''
Gallery.cb.prev Gallery.cb.prev
when Conf['Pause'] when Conf['Pause']