Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vaadin/framework
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mlindfors/framework
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 3 files changed
  • 3 contributors

Commits on Nov 30, 2018

  1. Fix Grid's frozen columns not being set (#10653) 

    In certain cases setting the frozen columns didn't produce the expected result in the client side widget state. This happened if the frozen columns value was set to be the same it was before removeAllColumns was called.

This fix removes the frozen column value from the diff state so that the value gets properly set in the client side.

Closes #10653
    @mlindfors
    mlindfors committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    192a49d View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2018

  1. Merge branch 'master' into master

    @ZheSun88
    ZheSun88 authored Dec 5, 2018
    Configuration menu
    Copy the full SHA
    8cde117 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2019

  1. Merge remote-tracking branch 'upstream/master'

    @mlindfors
    mlindfors committed Jan 31, 2019
    Configuration menu
    Copy the full SHA
    1282ba0 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2019

  1. Fix an NPE caused by the previous fix to Grid's frozen columns (#10653) 

    If the user managed to get two frozen column count changes into a single server round-trip before the component had been attached, the previous fix lead to a null pointer exception since there was no diff state available.

This fix adds a null check before removing the frozen column count value from the diff state so that this will not happen.

Closes #10653
    @mlindfors
    mlindfors committed Feb 1, 2019
    Configuration menu
    Copy the full SHA
    35d1190 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2019

  1. Merge branch 'master' into master

    Anastasia Smirnova authored Feb 4, 2019
    Configuration menu
    Copy the full SHA
    2b9dcce View commit details
    Browse the repository at this point in the history
Loading