summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/ntp/apps.js
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-22 01:45:26 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-22 01:45:26 +0000
commitedaeaae93378170a90e5c67dd6954791860d61a7 (patch)
tree3bfcb54d0e0ff97b6113ba78d5f072164b822960 /chrome/browser/resources/ntp/apps.js
parent22148ab57bb3c8743ea86f593f883f56bf0dd876 (diff)
downloadchromium_src-edaeaae93378170a90e5c67dd6954791860d61a7.zip
chromium_src-edaeaae93378170a90e5c67dd6954791860d61a7.tar.gz
chromium_src-edaeaae93378170a90e5c67dd6954791860d61a7.tar.bz2
Fix layout glitches in NTP. Also, lots of naming cleanup.
BUG=68677,67273 TEST= Review URL: http://codereview.chromium.org/6354016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/ntp/apps.js')
-rw-r--r--chrome/browser/resources/ntp/apps.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/resources/ntp/apps.js b/chrome/browser/resources/ntp/apps.js
index 4dd8bc1..e61ebe0 100644
--- a/chrome/browser/resources/ntp/apps.js
+++ b/chrome/browser/resources/ntp/apps.js
@@ -66,12 +66,12 @@ function getAppsCallback(data) {
apps.createWebStoreClosedMenuElement());
}
- if (!data.showLauncher || (shownSections & MINIMIZED_APPS)) {
+ if (!data.showLauncher)
appsSection.classList.add('disabled');
- } else {
+ else
appsSection.classList.remove('disabled');
- }
- addClosedMenuFooter(apps.menu, 'apps', MINIMIZED_APPS, Section.APPS);
+
+ addClosedMenuFooter(apps.menu, 'apps', MENU_APPS, Section.APPS);
apps.loaded = true;
if (apps.showPromo)
@@ -121,7 +121,7 @@ var apps = (function() {
function launchApp(appId) {
var appsSection = $('apps');
- var expanded = !appsSection.classList.contains('hidden');
+ var expanded = !appsSection.classList.contains('collapsed');
var element = document.querySelector(
(expanded ? '.maxiview' : '.miniview') + ' a[app-id=' + appId + ']');