Revert "Fixes non-editable column and selection visibility in editor"

This reverts commit 5460f5ec736f479795d3301acb73d62040c99311.

Change-Id: I043e3db57b55694c6ef87751e487472a778c1b8a

3 files changed, 1 insertions, 32 deletions

diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss
index 3fa5ddeb19..1653032703 100644
--- a/WebContent/VAADIN/themes/base/grid/grid.scss
+++ b/WebContent/VAADIN/themes/base/grid/grid.scss
@@ -189,14 +189,6 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co
   }
 
   // Rows
-  .#{$primaryStyleName}-row.editing {
-    > td {
-      background: $v-grid-editor-background-color;
-    }
-    &.#{$primaryStyleName}-row-selected > .v-grid-cell {
-      border-left: $v-grid-border;
-    }
-  }	
 
   .#{$primaryStyleName}-row > td,
   .#{$primaryStyleName}-editor-cells > div {
@@ -357,10 +349,6 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co
       vertical-align: middle;
       background: $v-grid-editor-background-color;
 
-      &.not-editable {
-        visibility: hidden;
-      }
-
       &:first-child {
         border-left: none;
       }
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index eabe133fd1..5cbfd5ea75 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -1115,7 +1115,6 @@ public class Grid<T> extends ResizeComposite implements
 
         private static final String ERROR_CLASS_NAME = "error";
         private static final String NOT_EDITABLE_CLASS_NAME = "not-editable";
-        private static final String CURRENTLY_EDITING_CLASS_NAME = "editing";
 
         protected enum State {
             INACTIVE, ACTIVATING, BINDING, ACTIVE, SAVING
@@ -1543,7 +1542,6 @@ public class Grid<T> extends ResizeComposite implements
 
             TableRowElement tr = grid.getEscalator().getBody()
                     .getRowElement(rowIndex);
-            tr.addClassName(CURRENTLY_EDITING_CLASS_NAME);
 
             scrollHandler = grid.addScrollHandler(new ScrollHandler() {
                 @Override
@@ -1649,6 +1647,7 @@ public class Grid<T> extends ResizeComposite implements
             if (editorOverlay.getParentElement() == null) {
                 return;
             }
+
             for (Widget w : columnToWidget.values()) {
                 setParent(w, null);
             }
@@ -1657,10 +1656,6 @@ public class Grid<T> extends ResizeComposite implements
             detachWidget(saveButton);
             detachWidget(cancelButton);
 
-            TableRowElement tr = grid.getEscalator().getBody()
-                    .getRowElement(rowIndex);
-            tr.removeClassName(CURRENTLY_EDITING_CLASS_NAME);
-
             editorOverlay.removeAllChildren();
             cellWrapper.removeAllChildren();
             editorOverlay.removeFromParent();
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
index 2cb40e1df8..dbb903ff98 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
@@ -57,20 +57,6 @@ public abstract class GridEditorTest extends GridBasicFeaturesTest {
     }
 
     @Test
-    public void testNonEditableCellDoesNotBlockContents() {
-        selectMenuPath(EDIT_ITEM_5);
-        assertEditorOpen();
-
-        WebElement editorCellContainer = getEditor().findElement(
-                By.className("v-grid-editor-cells"));
-        WebElement nonEditableDiv = editorCellContainer.findElements(
-                By.tagName("div")).get(3);
-
-        assertEquals("Non editable div was not hidden", "hidden",
-                nonEditableDiv.getCssValue("visibility"));
-    }
-
-    @Test
     public void testProgrammaticOpeningClosing() {
         selectMenuPath(EDIT_ITEM_5);
         assertEditorOpen();