Skip to content

Issue 280 (Drawer-like behavior for the sidebar) #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andreacampi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Issue 280 (Drawer-like behavior for the sidebar) #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1099ca8
Refactor: split most of StateManager.checkState() into a separate res…
Feb 9, 2012
6bbad87
If the sidebar is configured as a drawer, add an extra class and trig…
Feb 27, 2012
41ba65a
If the sidebar is a drawer, clicking elsewhere should not close it (#…
Feb 9, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/ui/chrome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,9 @@ goog.scope(function() {

if (!withinSidebar) {
this.sidebars.forEach(function(sidebar) {
this.sidebarInactive(sidebar);
if (!dom.hasClass(sidebar, 'drawer')) {
this.sidebarInactive(sidebar);
}
}, this);
}

Expand Down Expand Up @@ -1222,6 +1224,10 @@ goog.scope(function() {
sidebar: sidebar
});
dom.addClass(/** @type {!Element} */ (sidebar), 'sidebar-active');
if (dom.hasClass(sidebar, 'drawer')) {
dom.addClass(/** @type {!Element} */ (this.viewer), 'sidebar-drawer-active');
treesaver.ui.StateManager.resizeChrome();
}
};

/**
Expand All @@ -1234,6 +1240,10 @@ goog.scope(function() {
});
}
dom.removeClass(/** @type {!Element} */ (sidebar), 'sidebar-active');
if (dom.hasClass(sidebar, 'drawer')) {
dom.removeClass(/** @type {!Element} */ (this.viewer), 'sidebar-drawer-active');
treesaver.ui.StateManager.resizeChrome();
}
};

/**
Expand Down
73 changes: 42 additions & 31 deletions src/ui/statemanager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,43 +282,54 @@ goog.scope(function() {

// Check if we're at a new size
if (availSize.h !== StateManager.state_.size.h || availSize.w !== StateManager.state_.size.w) {
StateManager.state_.size = availSize;

// Check if chrome still fits
if (!StateManager.state_.chrome ||
!StateManager.state_.chrome.meetsRequirements() ||
!StateManager.state_.chrome.fits(availSize)) {
// Chrome doesn't fit, need to install a new one
newChrome = Chrome.select(StateManager.chromes_, availSize);

if (!newChrome) {
// TODO: Fire chrome failed event
// TODO: Show error page (no chrome)
return;
}
StateManager.resizeChrome();
}
};

// Remove existing chrome
dom.clearChildren(StateManager.state_.chromeContainer);
// Deactivate previous
if (StateManager.state_.chrome) {
StateManager.state_.chrome.deactivate();
}
/**
* Force computation of chrome size, including selection of a new one
* if necessary.
*/
StateManager.resizeChrome = function() {
var availSize = StateManager.getAvailableSize_(),
newChrome;

StateManager.state_.size = availSize;

// Activate and store
StateManager.state_.chromeContainer.appendChild(newChrome.activate());
StateManager.state_.chrome = newChrome;
// Check if chrome still fits
if (!StateManager.state_.chrome ||
!StateManager.state_.chrome.meetsRequirements() ||
!StateManager.state_.chrome.fits(availSize)) {
// Chrome doesn't fit, need to install a new one
newChrome = Chrome.select(StateManager.chromes_, availSize);

if (!newChrome) {
// TODO: Fire chrome failed event
// TODO: Show error page (no chrome)
return;
}

// Fire chrome change event
events.fireEvent(
document, StateManager.events.CHROMECHANGED, {
'node': newChrome.node
}
);
// Remove existing chrome
dom.clearChildren(StateManager.state_.chromeContainer);
// Deactivate previous
if (StateManager.state_.chrome) {
StateManager.state_.chrome.deactivate();
}

// Chrome handles page re-layout, if necessary
StateManager.state_.chrome.setSize(availSize);
// Activate and store
StateManager.state_.chromeContainer.appendChild(newChrome.activate());
StateManager.state_.chrome = newChrome;

// Fire chrome change event
events.fireEvent(
document, StateManager.events.CHROMECHANGED, {
'node': newChrome.node
}
);
}

// Chrome handles page re-layout, if necessary
StateManager.state_.chrome.setSize(availSize);
};

// Expose special functions for use by the native app wrappers
Expand Down