Merge branch 'master' of git.blender.org:pillar into elastic

This commit is contained in:
2017-12-01 16:24:56 +01:00
26 changed files with 202 additions and 352 deletions

View File

@@ -1,81 +1,3 @@
function projectNavCollapse() {
$("#project-side-container").addClass('collapsed');
};
function projectNavExpand() {
$("#project-side-container").removeClass('collapsed');
};
function projectNavCheck(){
/* Only run if there is a tree */
if(document.getElementById("project_tree") !== null) {
var nav_status = Cookies.getJSON('bcloud_ui');
if (nav_status && nav_status.nav_collapsed) {
if (nav_status.nav_collapsed == 'expanded') {
projectNavExpand();
} else if ( nav_status.nav_collapsed == 'collapsed' ) {
projectNavCollapse();
}
} else {
projectNavExpand();
}
}
}
function projectNavToggle(){
var nav_status = Cookies.getJSON('bcloud_ui');
if (nav_status && nav_status.nav_collapsed) {
if (nav_status.nav_collapsed == 'expanded') {
projectNavCollapse();
setJSONCookie('bcloud_ui', 'nav_collapsed', 'collapsed');
} else if ( nav_status.nav_collapsed == 'collapsed' ) {
projectNavExpand();
setJSONCookie('bcloud_ui', 'nav_collapsed', 'expanded');
}
} else {
projectNavCollapse();
setJSONCookie('bcloud_ui', 'nav_collapsed', 'collapsed');
}
$('#project_context-header').width($('#project_context-container').width());
}
$(function () {
/* Check on first load */
projectNavCheck();
$('.project_split, .project_nav-toggle-btn').on('click', function (e) {
projectNavToggle();
});
/* Only run if there is a tree */
if(document.getElementById("project_tree") !== null) {
$(document).keypress(function(e) {
var tag = e.target.tagName.toLowerCase();
/* Toggle when pressing [T] key */
if(e.which == 116 && tag != 'input' && tag != 'textarea' && !e.ctrlKey && !e.metaKey && !e.altKey) {
projectNavToggle();
}
});
}
});
/* Small utility to enable specific node_types under the Add New dropdown */
/* It takes:
* empty: Enable every item