Merge pull request #214 from zanata/rhbz1006063-Return-to-editor

fix return to editor problem in firefox: https://bugzilla.redhat.com/show_bug.cgi?id=1006063#c14
zanata · Oct 7, 2013 · 6806886 · 6806886
2 parents a75f861 + 9d02444
commit 6806886
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java b/zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
@@ -21,6 +21,7 @@
 
 package org.zanata.webtrans.client.service;
 
+import java.util.Collections;
 import java.util.List;
 
 import net.customware.gwt.presenter.client.EventBus;
@@ -120,6 +121,10 @@ private void bindHandlers() {
         eventBus.addHandler(RequestSelectTableRowEvent.TYPE, this);
     }
 
+    public void clearData() {
+        pageModel.setData(Collections.<TransUnit> emptyList());
+    }
+
     protected void requestTransUnitsAndUpdatePageIndex(
             GetTransUnitActionContext actionContext,
             final boolean needReloadIndex) {

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
@@ -128,6 +128,7 @@ public void run() {
      */
     private void copyTranslationToEditor() {
         TransUnit selectedTransUnit = navigationService.getSelectedOrNull();
+
         if (selectedTransUnit != null
                 && selectedTransUnit.getId().equals(transUnitId)) {
             timer.cancel();
@@ -154,6 +155,9 @@ public void onClick(ClickEvent event) {
         returnToEditor.addClickHandler(new ClickHandler() {
             @Override
             public void onClick(ClickEvent event) {
+                // clear data in navigation service to ensure first run of
+                // copyTranslationToEditor() = false
+                navigationService.clearData();
                 listener.gotoRow(documentInfo, transUnitId);
                 timer.schedule(CHECK_EDITOR_SELECTED_DURATION);
             }

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/validation_options.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/validation_options.xhtml
@@ -7,7 +7,7 @@
   xmlns:a4j="http://richfaces.org/a4j">
 
   <span class="name">#{messages['jsf.customizedValidationMessage']}</span>
-  <s:div id="validationOptionsList">
+  <s:div id="validationOptionsList" style="clear: both">
     <rich:dataTable value="#{validationOptionsAction.validationList}"
       var="validationAction">
       <rich:column>