');
if(settings.layoutOrientation == "horizontal") {
$('.ui-layout-resizer-north').append(previewButtonsElt);
@@ -449,52 +451,55 @@ define([
e.stopPropagation();
});
- menuPanelElt = $('.menu-panel');
+ menuPanelElt = $('.menu-panel').collapse({
+ toggle: false
+ });
var isMenuPanelShown = false;
var menuPanelBackdropElt = undefined;
- menuPanelElt.on('shown.bs.collapse', function(e) {
+ menuPanelElt.on('show.bs.collapse', function(e) {
if(e.target === menuPanelElt[0]) {
isMenuPanelShown = true;
- menuPanelBackdropElt = utils.createBackdrop();
+ menuPanelBackdropElt = utils.createBackdrop('collapse', '.menu-panel');
menuPanelElt.addClass('move-to-front');
- // Register a click listener when menu panel is open
- var closePanelElt = menuPanelElt.find('.action-close-panel').add(menuPanelBackdropElt);
- closePanelElt.on('click.hide-menu-panel', function(e) {
- // Unregister the listener
- $('body').off('click.hide-menu-panel');
- menuPanelElt.collapse('hide');
- isMenuPanelShown = false;
- });
}
- }).on('show.bs.collapse', function(){
- // Close all open sub-menus when one submenu opens
- menuPanelElt.find('.in').collapse('hide');
- }).on('hidden.bs.collapse', function(e) {
- // Close all open sub-menus when menu panel is closed
+ else {
+ // Close all open sub-menus when one submenu opens
+ menuPanelElt.find('.in').collapse('hide');
+ }
+ }).on('hide.bs.collapse', function(e) {
if(e.target === menuPanelElt[0]) {
+ isMenuPanelShown = false;
+ menuPanelBackdropElt.remove();
+ menuPanelElt.removeClass('move-to-front');
+ }
+ }).on('hidden.bs.collapse', function(e) {
+ if(e.target === menuPanelElt[0]) {
+ // Close all open sub-menus when menu panel is closed
menuPanelElt.find('.in').collapse('hide');
}
});
- documentPanelElt = $('.document-panel');
+ documentPanelElt = $('.document-panel').collapse({
+ toggle: false
+ });
var isDocumentPanelShown = false;
- documentPanelElt.on('shown.bs.collapse', function(e) {
+ var documentPanelBackdropElt = undefined;
+ documentPanelElt.on('show.bs.collapse', function(e) {
if(e.target === documentPanelElt[0]) {
isDocumentPanelShown = true;
- // Register a click listener when document panel is open
- $('body').on('click.hide-document-panel', function(e) {
- // If click outside the panel, close the panel and unregister
- // the listener
- if($(e.target).is('.action-close-panel, .action-close-panel *, :not(.document-panel, .document-panel *)')) {
- documentPanelElt.collapse('hide');
- $('body').off('click.hide-document-panel');
- isDocumentPanelShown = false;
- }
- });
+ documentPanelBackdropElt = utils.createBackdrop('collapse', '.document-panel');
+ documentPanelElt.addClass('move-to-front');
+ }
+ else {
+ // Close all open sub-menus when one submenu opens
+ documentPanelElt.find('.in').collapse('hide');
+ }
+ }).on('hide.bs.collapse', function(e) {
+ if(e.target === documentPanelElt[0]) {
+ isDocumentPanelShown = false;
+ documentPanelBackdropElt.remove();
+ documentPanelElt.removeClass('move-to-front');
}
- }).on('show.bs.collapse', function(){
- // Close all open sub-menus when one submenu opens
- documentPanelElt.find('.in').collapse('hide');
}).on('hidden.bs.collapse', function(e) {
if(e.target === documentPanelElt[0]) {
// Close all open sub-menus when menu panel is closed
@@ -503,7 +508,11 @@ define([
});
var isModalShown = false;
- $('.modal').on('shown.bs.modal', function() {
+ $('.modal').on('show.bs.modal', function() {
+ // Close panel if open
+ menuPanelElt.collapse('hide');
+ documentPanelElt.collapse('hide');
+ }).on('shown.bs.modal', function() {
// Focus on the first input when modal opens
isModalShown = true;
_.defer(function(elt) {
diff --git a/js/extensions/documentPanel.js b/js/extensions/documentPanel.js
index b76c393e..75e7ea3b 100644
--- a/js/extensions/documentPanel.js
+++ b/js/extensions/documentPanel.js
@@ -15,14 +15,28 @@ define([
};
var folderEltTmpl = [
- '
',
- '<%= _.size(folderDesc.fileList) %>
',
- ' <%= folderDesc.name %>',
- '
<%= fileListHtml %>
'
+ '
',
+ ' ',
+ ' <%= _.size(folderDesc.fileList) %>',
+ '
',
+ ' <%= folderDesc.name %>',
+ '',
+ '
',
+ ' <%= fileListHtml %>',
+ '
'
].join('');
var documentEltTmpl = [
- '
" data-file-index="<%= fileDesc.fileIndex %>">',
- '<%= fileDesc.composeTitle() %>',
+ '
"',
+ ' data-file-index="<%= fileDesc.fileIndex %>"',
+ ' data-toggle="collapse"',
+ ' data-target=".document-panel">',
+ ' <%= fileDesc.composeTitle() %>',
+ '',
].join('');
var panelElt = undefined;
@@ -43,7 +57,7 @@ define([
}) + '';
}, '').value();
documentListHtml = documentListHtml && '
';
-
+
// Build directories
_.chain(folderList).sortBy(function(folderDesc) {
return folderDesc.name.toLowerCase();
@@ -64,7 +78,7 @@ define([
});
documentListElt.innerHTML = documentListHtml;
-
+
// Add click listeners
_.each(documentListElt.querySelectorAll('.file'), function(fileElt) {
fileElt = $(fileElt);
@@ -112,7 +126,7 @@ define([
documentPanel.onReady = function() {
panelElt = document.querySelector('.document-panel');
documentListElt = panelElt.querySelector('.list-group');
-
+
// Open current folder before opening
$(panelElt).on('show.bs.collapse', function(e) {
var folderDesc = selectedFileDesc.folder;
@@ -122,7 +136,7 @@ define([
}).on('shown.bs.collapse', function(e) {
// Scroll to the active file
if(e.target === panelElt) {
- }
+ }
});
};
diff --git a/js/html/bodyIndex.html b/js/html/bodyIndex.html
index 9a6d40d4..7ac188a5 100644
--- a/js/html/bodyIndex.html
+++ b/js/html/bodyIndex.html
@@ -62,12 +62,10 @@