rhbz844820 - refresh target to make code mirror works

zanata · Sep 18, 2012 · 7ebc40b · 7ebc40b
1 parent 70d91d2
commit 7ebc40b
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 6 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditorTextArea.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditorTextArea.java
@@ -245,4 +245,21 @@ private native void codeMirrorHighlight(String term) /*-{
          editor.markText(searchCursor.from(), searchCursor.to(), "CodeMirror-searching");
       }
    }-*/;
+
+   public void refresh()
+   {
+      if (useCodeMirrorFlag)
+      {
+         refreshCodeMirror();
+      }
+   }
+
+   private native void refreshCodeMirror() /*-{
+      var editor = this.@org.zanata.webtrans.client.editor.table.EditorTextArea::codeMirrorEditor;
+
+      if (editor)
+      {
+         editor.refresh();
+      }
+   }-*/;
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
@@ -66,6 +66,8 @@ public interface TargetContentsDisplay extends WidgetDisplay, IsWidget, HasTrans
     */
    void updateCachedAndInEditorTargets(List<String> targets);
 
+   void refresh();
+
    interface Listener
    {
       void validate(ToggleEditor editor);

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
@@ -278,6 +278,15 @@ public void updateCachedAndInEditorTargets(List<String> targets)
       }
    }
 
+   @Override
+   public void refresh()
+   {
+      for (ToggleEditor editor : editors)
+      {
+         editor.refresh();
+      }
+   }
+
    @Override
    public Integer getVerNum()
    {

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java b/zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
@@ -73,7 +73,7 @@ private void processForDocumentListPresenter(HistoryToken token)
    private void processForAppPresenter(HistoryToken token)
    {
       DocumentId docId = documentListPresenter.getDocumentId(token.getDocumentPath());
-      if (!equal(appPresenter.getSelectedDocIdOrNull(), docId))
+      if (docId != null && !equal(appPresenter.getSelectedDocIdOrNull(), docId))
       {
          appPresenter.selectDocument(docId);
       }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
@@ -301,6 +301,12 @@ public void highlightSearch(String findMessage)
       textArea.highlight(findMessage);
    }
 
+   @Override
+   public void refresh()
+   {
+      textArea.refresh();
+   }
+
    @Override
    public void removeTranslator(String name, String color)
    {

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
@@ -24,6 +24,8 @@ public interface ToggleEditor extends IsWidget, HasText, HasUpdateValidationWarn
 
    void highlightSearch(String findMessage);
 
+   void refresh();
+
    static enum ViewMode
    {
       VIEW, EDIT

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.java
@@ -112,14 +112,11 @@ public void buildTable(List<SourceContentsDisplay> sourceDisplays, List<TargetCo
          cellFormatter.setVerticalAlignment(i, 1, HasVerticalAlignment.ALIGN_TOP);
          cellFormatter.setStyleName(i, 0, style.cellFormat());
          cellFormatter.setStyleName(i, 1, style.cellFormat());
-
+         sourceDisplay.refresh();
+         targetDisplay.refresh();
       }
       applyRowStyle();
 
-      for (SourceContentsDisplay sourceDisplay : sourceDisplays)
-      {
-         sourceDisplay.refresh();
-      }
    }
 
    private void showEmptyContentIfNoData(int dataSize)