summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/options
diff options
context:
space:
mode:
authoryoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 08:41:34 +0000
committeryoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-09 08:41:34 +0000
commit03cb0809030fecf2a1b08aae6109df84d8f6f9da (patch)
tree83206af01d188c0e9237585cb44bcafb4c17e496 /chrome/browser/resources/options
parent068170b21d6b3ea425d9b8febc4eeeeed628f4f9 (diff)
downloadchromium_src-03cb0809030fecf2a1b08aae6109df84d8f6f9da.zip
chromium_src-03cb0809030fecf2a1b08aae6109df84d8f6f9da.tar.gz
chromium_src-03cb0809030fecf2a1b08aae6109df84d8f6f9da.tar.bz2
cr/ui/list.js: Support rows with variable heights.
This patch also enables partial refreshing on WebUI Task Manager. BUG=104136 TEST=manual on TaskManager, CookieManager and FileManager Review URL: http://codereview.chromium.org/8608007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/options')
-rw-r--r--chrome/browser/resources/options/cookies_list.js4
-rw-r--r--chrome/browser/resources/options/intents_list.js4
2 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/resources/options/cookies_list.js b/chrome/browser/resources/options/cookies_list.js
index f48cd2b..4e70d1d 100644
--- a/chrome/browser/resources/options/cookies_list.js
+++ b/chrome/browser/resources/options/cookies_list.js
@@ -160,7 +160,6 @@ cr.define('options', function() {
this.classList.add('show-items');
} else {
if (this.list.expandedItem == this) {
- this.list.leadItemHeight = 0;
this.list.expandedItem = null;
}
this.style.height = '';
@@ -213,8 +212,6 @@ cr.define('options', function() {
this.classList.remove('measure-items');
this.itemsChild.style.height = itemsHeight + 'px';
this.style.height = fixedHeight + 'px';
- if (this.expanded)
- this.list.leadItemHeight = fixedHeight;
},
/**
@@ -623,6 +620,7 @@ cr.define('options', function() {
sm.addEventListener('leadIndexChange', this.cookieLeadChange_.bind(this));
this.selectionModel = sm;
this.infoNodes = {};
+ this.fixedHeight = false;
var doc = this.ownerDocument;
// Create a table for each type of site data (e.g. cookies, databases,
// etc.) and save it so that we can reuse it for all origins.
diff --git a/chrome/browser/resources/options/intents_list.js b/chrome/browser/resources/options/intents_list.js
index 28e722d..e2dc21e 100644
--- a/chrome/browser/resources/options/intents_list.js
+++ b/chrome/browser/resources/options/intents_list.js
@@ -115,7 +115,6 @@ cr.define('options', function() {
this.dataChild.hidden = true;
} else {
if (this.list.expandedItem == this) {
- this.list.leadItemHeight = 0;
this.list.expandedItem = null;
}
this.style.height = '';
@@ -169,8 +168,6 @@ cr.define('options', function() {
this.classList.remove('measure-items');
this.itemsChild.style.height = itemsHeight + 'px';
this.style.height = fixedHeight + 'px';
- if (this.expanded)
- this.list.leadItemHeight = fixedHeight;
},
/**
@@ -497,6 +494,7 @@ cr.define('options', function() {
sm.addEventListener('change', this.cookieSelectionChange_.bind(this));
sm.addEventListener('leadIndexChange', this.cookieLeadChange_.bind(this));
this.selectionModel = sm;
+ this.fixedHeight = false;
},
/**