diff options
| author | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 16:59:46 +0000 |
|---|---|---|
| committer | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-26 16:59:46 +0000 |
| commit | 5f1d4bfc647a6caf4d9bbc1ba7798a3ccdd4f3c4 (patch) | |
| tree | 3dbd78e969ffdfd5634ee86365d047c40fc7befa /chrome/browser | |
| parent | 4b664df1a64e56031f86976009e7289ad53bcb7e (diff) | |
| download | chromium_src-5f1d4bfc647a6caf4d9bbc1ba7798a3ccdd4f3c4.zip chromium_src-5f1d4bfc647a6caf4d9bbc1ba7798a3ccdd4f3c4.tar.gz chromium_src-5f1d4bfc647a6caf4d9bbc1ba7798a3ccdd4f3c4.tar.bz2 | |
Grid: delay columns calculation until it is possible.
Previous version set columns number to 1, if grid was not rendered (e.g. display=none).
Review URL: http://codereview.chromium.org/6877035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/resources/shared/js/cr/ui/grid.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/resources/shared/js/cr/ui/grid.js b/chrome/browser/resources/shared/js/cr/ui/grid.js index abed839..ca91d34 100644 --- a/chrome/browser/resources/shared/js/cr/ui/grid.js +++ b/chrome/browser/resources/shared/js/cr/ui/grid.js @@ -88,7 +88,7 @@ cr.define('cr.ui', function() { */ getColumnCount_: function() { var width = this.getItemWidth_(); - return width ? Math.floor(this.clientWidth / width) : 1; + return width ? Math.floor(this.clientWidth / width) : 0; }, /** @@ -97,7 +97,10 @@ cr.define('cr.ui', function() { * @type {number} */ get columns() { - return this.columns_ || (this.columns_ = this.getColumnCount_()); + if (!this.columns_) { + this.columns_ = this.getColumnCount_(); + } + return this.columns_ || 1; }, set columns(value) { if (value >= 0 && value != this.columns_) { |