Fix bug: 'enter' and 'ctrl+enter' didnt move to next entry: https://b…

…ugzilla.redhat.com/show_bug.cgi?id=747898
zanata · Oct 24, 2011 · 93783eb · 93783eb
1 parent daa2bfa
commit 93783eb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationView.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationView.java
@@ -83,16 +83,6 @@ else if (untranslatedMode && fuzzyMode)
       {
          setFuzzyUntranslatedModeTooltip();
       }
-      else if (!untranslatedMode && !fuzzyMode)
-      {
-         setNextEntryModeTooltip();
-      }
-   }
-
-   private void setNextEntryModeTooltip()
-   {
-      prevState.setTitle(messages.actionToolTip(messages.prevEntry(), messages.prevFuzzyOrUntranslatedShortcut()));
-      nextState.setTitle(messages.actionToolTip(messages.nextEntry(), messages.nextFuzzyOrUntranslatedShortcut()));
    }
 
    private void setFuzzyModeTooltip()

diff --git a/...ata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java b/...ata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
@@ -109,7 +109,7 @@ public void onClick(ClickEvent event)
    {
       public void onClick(ClickEvent event)
       {
-         saveApprovedAndMoveNextState(NavigationType.NextEntry);
+         saveAndMoveRow(NavigationType.NextEntry);
       }
    };
 
@@ -242,7 +242,7 @@ else if (checkKey.isSaveAsApprovedKey(isEnterKeySavesEnabled))
             {
                event.stopPropagation();
                event.preventDefault();
-               saveApprovedAndMoveNextState(NavigationType.NextEntry);
+               saveAndMoveRow(NavigationType.NextEntry);
             }
             else if (checkKey.isCloseEditorKey(isEscKeyCloseEditor))
             {
@@ -475,10 +475,6 @@ public void saveAndMoveNextState(NavigationType nav)
       {
          gotoFuzzyAndNewRow(nav);
       }
-      else if (!untranslatedMode && !fuzzyMode)
-      {
-         gotoRow(nav);
-      }
       else if (untranslatedMode)
       {
          gotoNewRow(nav);

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
@@ -73,7 +73,6 @@ private void init()
       optionsList.addItem(UserConfigConstants.OPTION_FUZZY_UNTRANSLATED);
       optionsList.addItem(UserConfigConstants.OPTION_FUZZY);
       optionsList.addItem(UserConfigConstants.OPTION_UNTRANSLATED);
-      optionsList.addItem(UserConfigConstants.OPTION_NEXT);
       mainPanel.add(optionsList);
 
       HorizontalPanel enteroptHP = new HorizontalPanel();
@@ -112,11 +111,6 @@ else if (selectedOption.equals(UserConfigConstants.OPTION_UNTRANSLATED))
                configMap.put(UserConfigConstants.BUTTON_FUZZY, false);
                configMap.put(UserConfigConstants.BUTTON_UNTRANSLATED, true);
             }
-            else if (selectedOption.equals(UserConfigConstants.OPTION_NEXT))
-            {
-               configMap.put(UserConfigConstants.BUTTON_FUZZY, false);
-               configMap.put(UserConfigConstants.BUTTON_UNTRANSLATED, false);
-            }
             eventBus.fireEvent(new UserConfigChangeEvent(configMap));
          }
       });

diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserConfigConstants.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserConfigConstants.java
@@ -39,7 +39,6 @@ public class UserConfigConstants
    public static final String OPTION_FUZZY_UNTRANSLATED = "Next Fuzzy/Untranslated";
    public static final String OPTION_FUZZY = "Next Fuzzy";
    public static final String OPTION_UNTRANSLATED = "Next Untranslated";
-   public static final String OPTION_NEXT = "Next Entry";
 }