Merge branch 'master' of github.com:zanata/zanata

zanata · Jul 8, 2011 · 0e9af9b · 0e9af9b
2 parents f2967e2 + 44d28cc
commit 0e9af9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
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
@@ -390,19 +390,12 @@ public void setText(String text)
 
    public void editCell(CellEditInfo cellEditInfo, TransUnit cellValue, Callback<TransUnit> callback)
    {
-
       // don't allow edits of two cells at once
       // if (isDirty())
       // {
       // callback.onCancel(cellEditInfo);
       // return;
       // }
-      // save the content in previous cell before start new editing
-      if (this.cellValue != null && !textArea.getText().equals(this.cellValue.getTarget()))
-      {
-         Log.debug("save content of previous cell");
-         acceptEdit();
-      }
 
       if (isEditing())
       {
@@ -412,6 +405,13 @@ public void editCell(CellEditInfo cellEditInfo, TransUnit cellValue, Callback<Tr
          }
          restoreView();
       }
+
+      // save the content in previous cell before start new editing
+      if (this.cellValue != null && curRow != cellEditInfo.getRowIndex() && !textArea.getText().equals(this.cellValue.getTarget()))
+      {
+         Log.debug("save content of previous cell");
+         acceptEdit();
+      }
 
       Log.debug("starting edit of cell");
 

diff --git a/server/zanata-war/src/main/webapp/img/logo.png b/server/zanata-war/src/main/webapp/img/logo.png